summaryrefslogtreecommitdiff
path: root/src/blackbox.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/blackbox.cc')
-rw-r--r--src/blackbox.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/blackbox.cc b/src/blackbox.cc
index 90d0d3cc..6d267b53 100644
--- a/src/blackbox.cc
+++ b/src/blackbox.cc
@@ -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);
}
@@ -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;
}