Merge lp:~smspillaz/compiz-core/compiz-core.fix_908042 into lp:compiz-core/0.9.5

[Sam Spilsbury]

Fixes failing timer test, bug 908042

[Thomas Voß (thomas-voss)]

Looks good to me.

review: Approve

[Daniel van Vugt (vanvugt)]

It does look OK. But why the use of both signed and unsigned ints?
  unsigned int calls;
  int maxCalls;

review: Approve

=== modified file 'src/timer/tests/callbacks/src/test-timer-callbacks.cpp'
--- src/timer/tests/callbacks/src/test-timer-callbacks.cpp	2011-12-23 05:32:02 +0000
+++ src/timer/tests/callbacks/src/test-timer-callbacks.cpp	2012-01-04 12:51:24 +0000
@@ -67,12 +67,13 @@
 	CompTimerTestCallbackDispatchTable (),
 	mMainLoop (ml)
     {
+	memset (&mCallsCounter, 0, sizeof (mCallsCounter));
 	ON_CALL (*this, callback1 (_)).WillByDefault (Invoke (this, &MockCompTimerTestCallbackDispatchTable::QuitIfLast));
 	ON_CALL (*this, callback2 (_)).WillByDefault (Invoke (this, &MockCompTimerTestCallbackDispatchTable::QuitIfLast));
 	ON_CALL (*this, callback3 (_)).WillByDefault (Invoke (this, &MockCompTimerTestCallbackDispatchTable::QuitIfLast));
     };
 
-    void setMax (unsigned int timerId, unsigned int maxCalls)
+    void setMax (unsigned int timerId, int maxCalls)
     {
 	mCallsCounter[timerId].maxCalls = maxCalls;
     }
@@ -84,15 +85,15 @@
     {
 	public:
 	    unsigned int calls;
-	    unsigned int maxCalls;
+	    int maxCalls;
     } mCallsCounter[3];
 
     bool QuitIfLast (unsigned int num)
     {
 	mCallsCounter[num].calls++;
 
-	if (!mCallsCounter[num].maxCalls ||
-	    mCallsCounter[num].maxCalls == mCallsCounter[num].calls)
+	if (mCallsCounter[num].maxCalls < 0 ||
+	    static_cast <unsigned int> (mCallsCounter[num].maxCalls) == mCallsCounter[num].calls)
 	{
 	    /* We are the last timer, quit the main loop */
 	    if (TimeoutHandler::Default ()->timers ().size () == 0)
@@ -141,7 +142,7 @@
     void AddTimer (unsigned int min,
 		   unsigned int max,
 		   const boost::function <bool ()> &callback,
-		   unsigned int maxAllowedCalls)
+		   int maxAllowedCalls)
     {
 	timers.push_back (new CompTimer ());
 	timers.back ()->setTimes (min, max);