X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.h;h=ba221832ab97d19f0de56f99f0572f4075ca1c00;hb=3263845459d15da683b7cab92fb856acbdf2800e;hp=673826a4a1e54552fe3990f2d9b676533042b9c2;hpb=5a3154df0878e37d0af8fdd9077133283879b38f;p=chaz%2Fopenbox

diff --git a/openbox/openbox.h b/openbox/openbox.h
index 673826a4..ba221832 100644
--- a/openbox/openbox.h
+++ b/openbox/openbox.h
@@ -23,19 +23,17 @@
 
 #include "render/render.h"
 #include "render/theme.h"
+#include "obt/mainloop.h"
+#include "obt/display.h"
 
 #include <glib.h>
 #include <X11/Xlib.h>
 
-struct _ObMainLoop;
-
 extern RrInstance *ob_rr_inst;
+extern RrImageCache *ob_rr_icons;
 extern RrTheme    *ob_rr_theme;
 
-extern struct _ObMainLoop *ob_main_loop;
-
-/*! The X display */
-extern Display *ob_display; 
+extern ObtMainLoop *ob_main_loop;
 
 /*! The number of the screen on which we're running */
 extern gint     ob_screen;
@@ -45,19 +43,19 @@ extern gchar   *ob_sm_id;
 /* This save_file will get pass to ourselves if we restart too! So we won't
  make a new file every time, yay. */
 extern gchar   *ob_sm_save_file;
+extern gboolean ob_sm_restore;
 extern gboolean ob_replace_wm;
-extern gchar   *ob_config_type;
 extern gboolean ob_debug_xinerama;
 
 /* The state of execution of the window manager */
-ObState ob_state();
+ObState ob_state(void);
 
 void ob_restart_other(const gchar *path);
-void ob_restart();
+void ob_restart(void);
 void ob_exit(gint code);
-void ob_exit_replace();
+void ob_exit_replace(void);
 
-void ob_reconfigure();
+void ob_reconfigure(void);
 
 void ob_exit_with_error(const gchar *msg);