X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.h;h=471aa779a5ea5063ced0d2fa18bd7ba13205148f;hb=c8ef10a0e1d8b75a8ae6027383a5081a9a1b0ea0;hp=e258d31e25f6dd5c8a90a93c7ed40d839d5b9920;hpb=53e75c5be435b8af86ba2de3dedb59ad4f74e6d9;p=chaz%2Fopenbox

diff --git a/openbox/openbox.h b/openbox/openbox.h
index e258d31e..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,6 +43,7 @@ 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 gboolean ob_debug_xinerama;