Merge lp:~om26er/ubuntu/oneiric/compiz-plugins-main/fix-sru-regressions-2 into lp:ubuntu/oneiric-proposed/compiz-plugins-main

[Omer Akram]

backport fix for the two linked SRU regressions

[Marco Trevisan (Treviño) (3v1n0)]

Looks good.

review: Approve

[Martin Pitt (pitti)]

Thanks! Will only apply to oneiric for now, as per discussion with Didier (see bug comments for details).

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-12 10:49:59 +0000
+++ debian/changelog	2011-11-28 11:59:33 +0000
@@ -1,3 +1,13 @@
+compiz-plugins-main (1:0.9.6-0ubuntu4.1) oneiric-proposed; urgency=low
+
+  * debian/patches/fix-875557.patch:
+    - Compiz grid overlay appears after workspace switcher use.
+      (LP: #875557)
+  * debian/patches/fix-891886.patch:
+    - Compiz grid plugin is fired when resizing a window. (LP: #891886)
+
+ -- Omer Akram <[e-mail]>  Mon, 28 Nov 2011 16:44:41 +0500
+
 compiz-plugins-main (1:0.9.6-0ubuntu4) oneiric-proposed; urgency=low
 
   * debian/patches/fix-872161.patch:
 
=== added file 'debian/patches/fix-875557.patch'
--- debian/patches/fix-875557.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-875557.patch	2011-11-28 11:59:33 +0000
@@ -0,0 +1,12 @@
+--- a/expo/src/expo.cpp	2011-10-05 06:48:41 +0000
++++ b/expo/src/expo.cpp	2011-11-26 20:47:23 +0000
+@@ -148,8 +148,6 @@
+     else
+ 	vpUpdateMode = VPUpdateMouseOver;
+ 
+-    dndState  = DnDNone;
+-
+     screen->removeAction (&optionGetDndButton ());
+     screen->removeAction (&optionGetExitButton ());
+     screen->removeAction (&optionGetNextVpButton ());
+
 
=== added file 'debian/patches/fix-891886.patch'
--- debian/patches/fix-891886.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-891886.patch	2011-11-28 11:59:33 +0000
@@ -0,0 +1,14 @@
+=== modified file 'src/grid.cpp'
+--- a/grid/src/grid.cpp	2011-10-05 17:41:22 +0000
++++ b/grid/src/grid.cpp	2011-11-19 18:19:19 +0000
+@@ -766,7 +766,8 @@
+ 			unsigned int state,
+ 			unsigned int mask)
+ {
+-    if (mask & (CompWindowGrabMoveMask | CompWindowGrabButtonMask))
++    if ((mask & (CompWindowGrabMoveMask | CompWindowGrabButtonMask)) &&
++        !(mask & CompWindowGrabResizeMask))
+     {
+ 	gScreen->o[0].value ().set ((int) window->id ());
+ 
+
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2011-10-12 10:49:59 +0000
+++ debian/patches/series	2011-11-28 11:59:33 +0000
@@ -11,3 +11,5 @@
 fix-868392.patch
 fix_clipping_issues_in_expo.patch
 fix-872161.patch
+fix-891886.patch
+fix-875557.patch