forked from pool/xfwm4
really remove xfwm4-fix-bug-in-workspace-deletion.patch
OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfwm4?expand=0&rev=69
This commit is contained in:
parent
9188f2b163
commit
dfc1c25c7d
@ -1,42 +0,0 @@
|
||||
From 0003144fdff6f3508b604103065512eb839ab838 Mon Sep 17 00:00:00 2001
|
||||
From: Olivier Fourdan <fourdan@xfce.org>
|
||||
Date: Wed, 18 Jul 2012 22:30:36 +0200
|
||||
Subject: [PATCH 12/14] Revert part of git commit 8637c3a as this breaks
|
||||
deletetion of current workspace (bug 8827)
|
||||
|
||||
---
|
||||
src/workspaces.c | 11 ++++++++++-
|
||||
1 files changed, 10 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/src/workspaces.c b/src/workspaces.c
|
||||
index fb19ab0..f57eec9 100644
|
||||
--- a/src/workspaces.c
|
||||
+++ b/src/workspaces.c
|
||||
@@ -492,7 +492,8 @@ workspaceInsert (ScreenInfo * screen_info, guint position)
|
||||
void
|
||||
workspaceDelete (ScreenInfo * screen_info, guint position)
|
||||
{
|
||||
- guint count;
|
||||
+ Client *c;
|
||||
+ guint i, count;
|
||||
|
||||
g_return_if_fail (screen_info != NULL);
|
||||
|
||||
@@ -504,6 +505,14 @@ workspaceDelete (ScreenInfo * screen_info, guint position)
|
||||
return;
|
||||
}
|
||||
|
||||
+ for (c = screen_info->clients, i = 0; i < screen_info->client_count; c = c->next, i++)
|
||||
+ {
|
||||
+ if (c->win_workspace > position)
|
||||
+ {
|
||||
+ clientSetWorkspace (c, c->win_workspace - 1, TRUE);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
workspaceSetCount(screen_info, count - 1);
|
||||
}
|
||||
|
||||
--
|
||||
1.7.7
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package xfwm4
|
||||
#
|
||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
|
Loading…
Reference in New Issue
Block a user