[xfwm4] Delete active workspace instead of last workspace (bugzilla.xfce.org #8827)

[Christoph Wickert]

commit 25e01219e6bf18549e7e877ec212bc36a61f15d0
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sun Oct 7 00:33:07 2012 +0200

    Delete active workspace instead of last workspace (bugzilla.xfce.org #8827)

 xfwm4-4.10.0-workspace-deletion.patch |   38 +++++++++++++++++++++++++++++++++
 xfwm4-4.9.1-nodoka.patch              |   12 ----------
 xfwm4.spec                            |   13 +++++++++-
 3 files changed, 49 insertions(+), 14 deletions(-)
---
diff --git a/xfwm4-4.10.0-workspace-deletion.patch b/xfwm4-4.10.0-workspace-deletion.patch
new file mode 100644
index 0000000..7fd2b21
--- /dev/null
+++ b/xfwm4-4.10.0-workspace-deletion.patch
@@ -0,0 +1,38 @@
+From 0003144fdff6f3508b604103065512eb839ab838 Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <fourdan at xfce.org>
+Date: Wed, 18 Jul 2012 20:30:36 +0000
+Subject: Revert part of git commit 8637c3a as this breaks deletetion
+
+of current workspace (bug 8827)
+---
+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);
+ }
+ 
+--
+cgit v0.9.0.3
diff --git a/xfwm4.spec b/xfwm4.spec
index 24c8363..f8af63c 100644
--- a/xfwm4.spec
+++ b/xfwm4.spec
@@ -2,7 +2,7 @@
 
 Name:           xfwm4
 Version:        4.10.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Next generation window manager for Xfce
 
 Group:          User Interface/Desktops
@@ -14,12 +14,17 @@ Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-
 # Upstream bug: https://bugzilla.xfce.org/show_bug.cgi?id=8949
 # Upstream fix: http://git.xfce.org/xfce/xfwm4/commit/?id=0b39bbe0
 Patch0:         xfwm4-4.10.0-gtk3-windows.patch
+# Fix potential crash in xfce4-settings-manager through wrong xfwm4 settings
 # Upstream bug: https://bugzilla.xfce.org/show_bug.cgi?id=9108
 # Upstream fix: http://git.xfce.org/xfce/xfwm4/commit/?id=f09ea920
 Patch1:         xfwm4-4.10.0-wrong-title-alignment.patch
+# Delete active workspace instead of last workspace
+# Upstream bug: https://bugzilla.xfce.org/show_bug.cgi?id=8827
+# Upstream fix: http://git.xfce.org/xfce/xfwm4/commit/?id=0003144f
+Patch2:         xfwm4-4.10.0-workspace-deletion.patch
 ## Downstream patches:
 # Fix desktop categories
-Patch10:         xfwm4-4.9.0-desktop-fix.patch
+Patch10:        xfwm4-4.9.0-desktop-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxfce4ui-devel >= %{xfceversion}
@@ -42,6 +47,7 @@ xfwm4 is a window manager compatible with GNOME, GNOME2, KDE2, KDE3 and Xfce.
 %setup -q
 %patch0 -p1 -b .gtk3
 %patch1 -p1 -b .title-alignment
+%patch2 -p1 -b .workspace-deletion
 %patch10 -p1 -b .categories
 
 
@@ -97,6 +103,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sun Oct 07 2012 Christoph Wickert <cwickert at fedoraproject.org> - 4.10.0-5
+- Delete active workspace instead of last workspace (bugzilla.xfce.org #8827)
+
 * Sat Oct 06 2012 Christoph Wickert <cwickert at fedoraproject.org> - 4.10.0-4
 - Fix potential crash in xfce4-settings-manager (bugzilla.xfce.org #9108)