api cleanups for render/theme.h

[chaz/openbox] / openbox / openbox.h

diff --git a/openbox/openbox.h b/openbox/openbox.h
index 5ed4c11e8151caca1fe518d10d0ee30a54a6642c..4e7bd818a5f626bf180fe25bd39a37006aae52b8 100644 (file)
--- a/openbox/openbox.h
+++ b/openbox/openbox.h
@@ -6,24 +6,19 @@
 #include "render/render.h"
 #include "render/theme.h"
 
-#ifdef USE_LIBSN
-#  define SN_API_NOT_YET_FROZEN
-#  include <libsn/sn.h>
-#endif
-
 #include <glib.h>
 #include <X11/Xlib.h>
 
+struct _ObMainLoop;
+
 extern RrInstance *ob_rr_inst;
 extern RrTheme    *ob_rr_theme;
 
+extern struct _ObMainLoop *ob_main_loop;
+
 /*! The X display */
 extern Display *ob_display; 
 
-#ifdef USE_LIBSN
-SnDisplay *ob_sn_display;
-#endif
-
 /*! The number of the screen on which we're running */
 extern gint     ob_screen;
 
@@ -36,7 +31,11 @@ ObState ob_state();
 
 void ob_restart_other(const gchar *path);
 void ob_restart();
-void ob_exit();
+void ob_exit(gint code);
+
+void ob_reconfigure();
+
+void ob_exit_with_error(gchar *msg);
 
 Cursor ob_cursor(ObCursor cursor);