Merge lp:~compiz-team/compiz/compiz.fix_1002606 into lp:compiz/0.9.8

[Sam Spilsbury]

Fix a typo that was causing LP: #1002606 (widthIncBorders/heightIncBorders)

[Sam Spilsbury (smspillaz)]

(btw, I checked recent merges for any related typoes and didn't find any, so I think we should be safe)

[Daniel van Vugt (vanvugt)]

Wow. How did we not notice that?...

Also, I'm not sure 'place' is working properly for me any more. But this branch doesn't seem to make it any worse.

review: Approve

[Sam Spilsbury (smspillaz)]

BTW, this section of the code was not under test, which is why it broke so easily. I say merge this in, but lets keep an eye on getting stuff under test before we merge it ;-)

=== modified file 'plugins/place/src/place.cpp'
--- plugins/place/src/place.cpp	2012-04-04 04:47:00 +0000
+++ plugins/place/src/place.cpp	2012-06-02 11:34:26 +0000
@@ -1197,10 +1197,10 @@
 
     extents.left   = pos.x () - window->border ().left;
     extents.top    = pos.y () - window->border ().top;
-    extents.right  = extents.left + window->serverGeometry ().heightIncBorders () +
+    extents.right  = extents.left + window->serverGeometry ().widthIncBorders () +
 		     (window->border ().left +
 		      window->border ().right);
-    extents.bottom = extents.top + window->serverGeometry ().widthIncBorders () +
+    extents.bottom = extents.top + window->serverGeometry ().heightIncBorders () +
 		     (window->border ().top +
 		      window->border ().bottom);