X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fblackbox.cc;h=ca6ac814ebda19f0f0684d22ff3d24de8ca8c8b7;hb=62356a72a95a9f95b933f915f13b284e2be45274;hp=90d0d3cc7143b3d83b24bff4c68d0f56ce845e3f;hpb=42e406d09da3cfe06c99f2b2fe369572afe3475f;p=chaz%2Fopenbox

diff --git a/src/blackbox.cc b/src/blackbox.cc
index 90d0d3cc..ca6ac814 100644
--- a/src/blackbox.cc
+++ b/src/blackbox.cc
@@ -81,7 +81,7 @@ using std::string;
 #include "otk/assassin.hh"
 #include "screen.hh"
 #include "util.hh"
-#include "window.hh"
+#include "bbwindow.hh"
 #include "workspace.hh"
 #include "xatom.hh"
 
@@ -158,7 +158,9 @@ Blackbox::Blackbox(int argc, char **m_argv, char *rc)
 
   reconfigure_wait = False;
 
-  timer = new OBTimer(this);
+  timer = new otk::OBTimer(Openbox::instance->timerManager(),
+                           (otk::OBTimeoutHandler)timeout,
+                           this);
   timer->setTimeout(0l);
 }
 
@@ -1130,7 +1132,7 @@ void Blackbox::reconfigure(void) {
 
   reconfigure_wait = True;
 
-  if (! timer->isTiming()) timer->start();
+  if (! timer->timing()) timer->start();
 }
 
 
@@ -1151,11 +1153,11 @@ void Blackbox::saveStyleFilename(const string& filename) {
 }
 
 
-void Blackbox::timeout(void) {
-  if (reconfigure_wait)
-    real_reconfigure();
+void Blackbox::timeout(Blackbox *t) {
+  if (t->reconfigure_wait)
+    t->real_reconfigure();
 
-  reconfigure_wait = False;
+  t->reconfigure_wait = False;
 }