Merge branch 'master' into chaz

[chaz/openbox] / openbox / openbox.h

diff --git a/openbox/openbox.h b/openbox/openbox.h
index 2a938c5d1154edc4e02a3529f3e22776b6034bfa..94f49105879bb415e6a5e4e4e04a11fb5e2eb569 100644 (file)
--- a/openbox/openbox.h
+++ b/openbox/openbox.h
@@ -21,19 +21,17 @@
 
 #include "misc.h"
 
-#include "render/render.h"
-#include "render/theme.h"
-#include "obt/mainloop.h"
+#include "obrender/render.h"
+#include "obrender/theme.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;
+extern GMainLoop *ob_main_loop;
 
 /*! The number of the screen on which we're running */
 extern gint     ob_screen;
@@ -47,6 +45,9 @@ extern gboolean ob_sm_restore;
 extern gboolean ob_replace_wm;
 extern gboolean ob_debug_xinerama;
 
+/*! The current locale for the LC_MESSAGES category */
+extern const gchar *ob_locale_msg;
+
 /* The state of execution of the window manager */
 ObState ob_state(void);
 void ob_set_state(ObState state);
@@ -58,10 +59,8 @@ void ob_exit_replace(void);
 
 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