Merge lp:~bfiller/unity-2d/metacity-cycle-workspace-switcher into lp:~unity-2d-team/unity-2d/metacity

[Bill Filler]

This change allows the workspace switcher to cycle from last to first workspace when using the right arrow key when current workspace is the last workspace. Similarly, if current workspace is the first workspace and the left arrow is pressed in the workspace switcher the workspace is switched to last workspace. This is similar to how most compiz workspace switchers (i.e. cube) work.

[Aurélien Gâteau (agateau)]

Works fine, but branch needs to be updated as Metacity has been updated to 2.30.3 in Natty (Patch applies without problem on the new version)

review: Needs Fixing

[Aurélien Gâteau (agateau)]

Since it applies just fine against Maverick, let's approve it.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-05 13:20:50 +0000
+++ debian/changelog	2011-02-08 22:38:15 +0000
@@ -1,3 +1,12 @@
+metacity (1:2.30.2-0ubuntu1upicek6) maverick; urgency=low
+
+  * debian/patches/17-workspace-switcher-cycle.patch: added patch
+    to cause workspace switcher to cycle from last workspace to
+    first workspace and vice versa when using arrow keys. This
+    allows functionality similar to workspace switcher in compiz 
+
+ -- Bill Filler <[e-mail]>  Tue, 08 Feb 2011 17:27:04 -0500
+
 metacity (1:2.30.2-0ubuntu1upicek5) maverick; urgency=low
 
   * Enable the capture before unmap option by default
 
=== added file 'debian/patches/17-workspace-switcher-cycle.patch'
--- debian/patches/17-workspace-switcher-cycle.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/17-workspace-switcher-cycle.patch	2011-02-08 22:38:15 +0000
@@ -0,0 +1,15 @@
+diff -Nur -x '*.orig' -x '*~' metacity-2.30.2//src/core/workspace.c metacity-2.30.2.new//src/core/workspace.c
+--- metacity-2.30.2//src/core/workspace.c	2011-02-08 17:17:36.000000000 -0500
++++ metacity-2.30.2.new//src/core/workspace.c	2011-02-08 17:23:00.628654844 -0500
+@@ -840,9 +840,9 @@
+     }
+ 
+   if (layout.current_col < 0)
+-    layout.current_col = 0;
++    layout.current_col = num_workspaces - 1;
+   if (layout.current_col >= layout.cols)
+-    layout.current_col = layout.cols - 1;
++    layout.current_col = 0;
+   if (layout.current_row < 0)
+     layout.current_row = 0;
+   if (layout.current_row >= layout.rows)
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2011-02-02 18:34:40 +0000
+++ debian/patches/series	2011-02-08 22:38:15 +0000
@@ -11,5 +11,6 @@
 14_wrong_colormap.patch
 15_show_maximized_titlebars.patch
 16-capture-before-unmap.patch
+17-workspace-switcher-cycle.patch
 90_autotools.patch
 99_ltmain_as-needed.patch