Merge lp:~vanvugt/compiz/fix-1097179 into lp:compiz/0.9.9

[Daniel van Vugt]

Fix multiple errors reported by valgrind in compiz_test_resize_logic
"Conditional jump or move depends on uninitialised value(s)"
(LP: #1097179)

[Sam Spilsbury (smspillaz)]

review: Approve

=== modified file 'plugins/resize/src/logic/tests/test-logic.cpp'
--- plugins/resize/src/logic/tests/test-logic.cpp	2012-09-03 21:21:12 +0000
+++ plugins/resize/src/logic/tests/test-logic.cpp	2013-01-09 05:34:23 +0000
@@ -90,6 +90,10 @@
 	EXPECT_CALL (mockWindow, state ())
 	    .WillRepeatedly (ReturnPointee (&mockWindowState));
 
+	mockWindowBorder.left = 1;
+	mockWindowBorder.right = 2;
+	mockWindowBorder.top = 3;
+	mockWindowBorder.bottom = 4;
 	EXPECT_CALL (mockWindow, border ())
 	    .WillRepeatedly (ReturnRef (mockWindowBorder));
 
@@ -144,8 +148,6 @@
 	EXPECT_CALL (mockScreen, compositingActive ())
 	    .WillRepeatedly (Return (true));
 
-	EXPECT_CALL (mockScreen, damageRegion (_));
-
 	EXPECT_CALL (mockScreen, syncEvent ())
 	    .WillRepeatedly (Return (-XSyncAlarmNotify));
 
@@ -178,7 +180,7 @@
     {
 	logic.resizeInformationAtom = &fakePropWriter;
 	logic.mScreen = &mockScreen;
-	logic.cScreen = &mockScreen;
+	logic.cScreen = NULL;   // avoid entering CompositeScreen during tests
 	logic.gScreen = &mockScreen;
 	logic.options = &resizeOptions;
     }