Merge lp:~compiz-team/compiz-core/compiz-core.fix_860306 into lp:compiz-core/0.9.5

[Sam Spilsbury]

Fix Bug 860306

[Robert Carr (robertcarr)]

+1!

review: Approve

=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2011-09-19 13:00:51 +0000
+++ plugins/decor/src/decor.cpp	2011-09-27 12:02:51 +0000
@@ -1126,6 +1126,9 @@
     o.at (0).setName ("window", CompOption::TypeInt);
     o.at (0).value ().set ((int) w->id ());
 
+    xwc.x += w->serverGeometry ().x ();
+    xwc.y += w->serverGeometry ().y ();
+
     w->configureXWindow (mask, &xwc);
     screen->handleCompizEvent ("decor", "window_decorated", o);
     return false;
@@ -1549,8 +1552,11 @@
 
 	memset (&xwc, 0, sizeof (XWindowChanges));
 
-	xwc.x = window->serverGeometry ().x () + moveDx;
-	xwc.y = window->serverGeometry ().y () + moveDy;
+	/* Grab the geometry last sent to server at configureXWindow
+	 * time and not here since serverGeometry may be updated by
+	 * the time that we do call configureXWindow */
+	xwc.x = moveDx;
+	xwc.y = moveDy;
 
 	/* Except if it's fullscreen, maximized or such */
 	if (window->state () & CompWindowStateFullscreenMask)