X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Ftimerqueuemanager.cc;h=a37fe94dbca4827e8ccff7aed72f4f090cea140e;hb=70eb03ad50e1a71fd64c8cb1ebabbff311850553;hp=0d7d4983be51646a973620ed532ab3550f0519f5;hpb=b0a532db8adeb909fa2cd8e518ca6917a2d7df0a;p=chaz%2Fopenbox

diff --git a/otk/timerqueuemanager.cc b/otk/timerqueuemanager.cc
index 0d7d4983..a37fe94d 100644
--- a/otk/timerqueuemanager.cc
+++ b/otk/timerqueuemanager.cc
@@ -1,4 +1,4 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
 #ifdef    HAVE_CONFIG_H
 #  include "../config.h"
@@ -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();
   }
 }