X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fblackbox.hh;h=42ddeabbd2778d9129d319c498aa0c63bddfc624;hb=410a8264586671256f4a2d1b3095fa6ecffc01bd;hp=0034f9f27845277c3d973ff1e9bd5fc9af1f21cc;hpb=c9f36d34a414123cec8ebc35c87b8b9d5673b155;p=chaz%2Fopenbox

diff --git a/src/blackbox.hh b/src/blackbox.hh
index 0034f9f2..42ddeabb 100644
--- a/src/blackbox.hh
+++ b/src/blackbox.hh
@@ -28,7 +28,7 @@ extern "C" {
 #include "otk/timer.hh"
 #include "otk/property.hh"
 #include "openbox.hh"
-#include "configuration.hh"
+#include "otk/configuration.hh"
 #include "timer.hh"
 
 #define AttribShaded      (1l << 0)
@@ -111,7 +111,7 @@ private:
   BScreen *active_screen;
   BlackboxWindow *focused_window, *changing_window;
   otk::OBTimer *timer;
-  Configuration config;
+  otk::Configuration config;
   otk::OBProperty *xatom;
 
   bool no_focus, reconfigure_wait;
@@ -163,7 +163,7 @@ public:
   inline BlackboxWindow *getFocusedWindow(void) { return focused_window; }
   inline BlackboxWindow *getChangingWindow(void) { return changing_window; }
 
-  inline Configuration *getConfig() { return &config; }
+  inline otk::Configuration *getConfig() { return &config; }
   inline const Time &getDoubleClickInterval(void) const
   { return resource.double_click_interval; }
   inline const Time &getLastTime(void) const { return last_time; }