Merge branch 'backport' into work

[mikachu/openbox.git] / openbox / openbox.h

diff --git a/openbox/openbox.h b/openbox/openbox.h
index 4f2310f..2a938c5 100644 (file)
--- a/openbox/openbox.h
+++ b/openbox/openbox.h
@@ -23,20 +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;
@@ -51,14 +48,15 @@ extern gboolean ob_replace_wm;
 extern gboolean ob_debug_xinerama;
 
 /* The state of execution of the window manager */
-ObState ob_state();
+ObState ob_state(void);
+void ob_set_state(ObState state);
 
 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);