Merge branch 'backport' into work

[chaz/openbox] / openbox / openbox.h

diff --git a/openbox/openbox.h b/openbox/openbox.h
index ba221832ab97d19f0de56f99f0572f4075ca1c00..b05292197000da945872cc5afad7dff59ef2725e 100644 (file)
--- a/openbox/openbox.h
+++ b/openbox/openbox.h
@@ -49,6 +49,7 @@ extern gboolean ob_debug_xinerama;
 
 /* The state of execution of the window manager */
 ObState ob_state(void);
+void ob_set_state(ObState state);
 
 void ob_restart_other(const gchar *path);
 void ob_restart(void);
@@ -57,10 +58,10 @@ 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);
+gboolean ob_keycode_match(KeyCode code, ObKey key);
 
 #endif