new OBTimer interface

[chaz/openbox] / otk / timerqueuemanager.cc

diff --git a/otk/timerqueuemanager.cc b/otk/timerqueuemanager.cc
index 0d7d4983be51646a973620ed532ab3550f0519f5..846648d32d88876dc19118a564e51a55277a2d0c 100644 (file)
--- a/otk/timerqueuemanager.cc
+++ b/otk/timerqueuemanager.cc
@@ -23,7 +23,7 @@ void OBTimerQueueManager::fire()
     const OBTimer* const timer = timerList.top();
 
     gettimeofday(&now, 0);
-    tm = timer->timeRemaining(now);
+    tm = timer->remainingTime(now);
 
     timeout = &tm;
   }
@@ -44,9 +44,8 @@ void OBTimerQueueManager::fire()
 
     timerList.pop();
 
-    timer->fireTimeout();
-    timer->halt();
-    if (timer->isRecurring())
+    timer->fire();
+    if (timer->recurring())
       timer->start();
   }
 }