X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.h;h=471aa779a5ea5063ced0d2fa18bd7ba13205148f;hb=def8fc707d1146a4edccbca85afc93d6bdbff440;hp=b5d722e9ef5a6e5115196f3d82bb32c4cb81750e;hpb=5c96972bfffacb7dc24c96673f85e413e5c87b94;p=chaz%2Fopenbox

diff --git a/openbox/openbox.h b/openbox/openbox.h
index b5d722e9..471aa779 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,8 +43,9 @@ 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();