make openbox base-dir spec compliant, and change the theme dir structure, so that...

[chaz/openbox] / openbox / dock.h

diff --git a/openbox/dock.h b/openbox/dock.h
index 99cc01f3a962dd7e8d7549fd0bbeb11cc0780ce5..cf35bff998048c54870272c104b1de2a9fd44d0c 100644 (file)
--- a/openbox/dock.h
+++ b/openbox/dock.h
@@ -1,7 +1,6 @@
 #ifndef __dock_h
 #define __dock_h
 
-#include "timer.h"
 #include "window.h"
 #include "stacking.h"
 #include "geom.h"
@@ -28,7 +27,6 @@ struct _ObDock
     gint h;
 
     gboolean hidden;
-    ObTimer *hide_timer;
 
     GList *dock_apps;
 };
@@ -50,10 +48,10 @@ struct _ObDockApp {
     gint h;
 };
 
-extern Strut dock_strut;
+extern StrutPartial dock_strut;
 
-void dock_startup();
-void dock_shutdown();
+void dock_startup(gboolean reconfig);
+void dock_shutdown(gboolean reconfig);
 
 void dock_configure();
 void dock_hide(gboolean hide);