moving window.cc/hh to bbwindow.cc/hh since we'll have our own window class coming...

[chaz/openbox] / src / screen.cc

diff --git a/src/screen.cc b/src/screen.cc
index 7ac74c3ce8e96b4e811736c9be7666da109f1b81..f8b998e6687f0bddfd51faaa47bc549853792931 100644 (file)
--- a/src/screen.cc
+++ b/src/screen.cc
@@ -132,7 +132,8 @@ BScreen::BScreen(Blackbox *bb, unsigned int scrn) : ScreenInfo(scrn) {
   updateAvailableArea();
 
   image_control =
-    new otk::BImageControl(this, True, blackbox->getColorsPerChannel(),
+    new otk::BImageControl(Openbox::instance->timerManager(),
+                           this, True, blackbox->getColorsPerChannel(),
                            blackbox->getCacheLife(), blackbox->getCacheMax());
   image_control->installRootColormap();
   root_colormap_installed = True;
@@ -779,7 +780,7 @@ void BScreen::reconfigure(void) {
       bw->reconfigure();
   }
 
-  image_control->timeout();
+  otk::BImageControl::timeout(image_control);
 }