Merge lp:~sjakthol/compiz/fix-1063871 into lp:compiz/0.9.9

[Sami Jaktholm]

Grid: Reset the currently handled window in the GridWindow destructor
only if the destroyed window was the handled one.

Currently completely unrelated GridWindow destruction will erase the
saved ID of the window Grid should be handling. This will break
the functionality if a GridWindow is destroyed while another window
is being dragged.

Fixes LP: #1067812 and LP: #1048855.

Test case:
1. Open Gedit
2. Drag window to the right edge of your screen
3. Drop the window

Current behavior: Grid fails to function.

Behavior with this fix:
At (2) the orange overlay appears and at (3) window snaps to the right half of the screen.

This issue happens with Gedit because when a Gedit window is grabbed, few destruction events of GridWindows are triggered. Other applications might be affected too.

[MC Return (mc-return)]

Great 8) - Have not tested it yet, but the .diff and your description look sane to me.

Keep them fixes comin' ;)

review: Approve

[MC Return (mc-return)]

I have compiled and tested your fix now and can confirm it works like intended. Top job !
Finally I can use Grid with gedit \o/

[Daniel van Vugt (vanvugt)]

Seems to work. I could only kind of reproduce and test bug 1048855. And even then, I could only reproduce it with wall when _not_ on the far-right workspace.

review: Approve

=== modified file 'plugins/grid/src/grid.cpp'
--- plugins/grid/src/grid.cpp	2012-10-15 19:16:23 +0000
+++ plugins/grid/src/grid.cpp	2012-10-18 11:24:20 +0000
@@ -1143,7 +1143,9 @@
     if (gScreen->mGrabWindow == window)
 	gScreen->mGrabWindow = NULL;
 
-    gScreen->o[0].value ().set (0);
+    CompWindow *w = screen->findWindow (CompOption::getIntOptionNamed (gScreen->o, "window"));
+    if (w == window)
+	gScreen->o[0].value ().set (0);
 }
 
 /* Initial plugin init function called. Checks to see if we are ABI