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

[Sam Spilsbury]

Fix bug 796594

[Jason Smith (jassmith)]

review: Approve

=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2011-09-27 11:54:45 +0000
+++ plugins/decor/src/decor.cpp	2011-09-28 12:38:12 +0000
@@ -1508,7 +1508,7 @@
 	/* Set extents based on maximize/unmaximize state
 	 * FIXME: With the new type system, this should be
 	 * removed */
-	if ((window->state () & MAXIMIZE_STATE) == MAXIMIZE_STATE)
+	if ((window->state () & MAXIMIZE_STATE))
 	    window->setWindowFrameExtents (&wd->decor->maxBorder,
 					   &wd->decor->maxInput);
 	else if (!window->hasUnmapReference ())

=== modified file 'src/window.cpp'
--- src/window.cpp	2011-09-27 15:45:28 +0000
+++ src/window.cpp	2011-09-28 12:38:12 +0000
@@ -6640,7 +6640,11 @@
     if (priv->serverInput.left   != i->left ||
 	priv->serverInput.right  != i->right ||
 	priv->serverInput.top    != i->top ||
-	priv->serverInput.bottom != i->bottom)
+	priv->serverInput.bottom != i->bottom ||
+	priv->border.left   != b->left ||
+	priv->border.right  != b->right ||
+	priv->border.top    != b->top ||
+	priv->border.bottom != b->bottom)
     {
 	unsigned long data[4];