X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.h;h=9eaee553f875493bb8e9b962051c0e2cca1984fa;hb=096dad0c6c027100494ede811b33cb8558d32e25;hp=47d92042e2eed946931c7a0dcb49ba3fe2a18683;hpb=3167fc223ea82851ae954b348a5ff1c0ce6b6d79;p=chaz%2Fopenbox

diff --git a/openbox/openbox.h b/openbox/openbox.h
index 47d92042..9eaee553 100644
--- a/openbox/openbox.h
+++ b/openbox/openbox.h
@@ -21,15 +21,15 @@
 
 #include "misc.h"
 
-#include "render/render.h"
-#include "render/theme.h"
+#include "obrender/render.h"
+#include "obrender/theme.h"
 #include "obt/mainloop.h"
 #include "obt/display.h"
 
 #include <glib.h>
-#include <X11/Xlib.h>
 
 extern RrInstance *ob_rr_inst;
+extern RrImageCache *ob_rr_icons;
 extern RrTheme    *ob_rr_theme;
 
 extern ObtMainLoop *ob_main_loop;
@@ -47,19 +47,18 @@ 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);
+void ob_exit_with_error(const gchar *msg) G_GNUC_NORETURN;
 
 Cursor ob_cursor(ObCursor cursor);
 
-KeyCode ob_keycode(ObKey key);
-
 #endif