From: Dana Jansens <danakj@orodu.net>
Date: Sun, 2 Mar 2008 22:25:13 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.7-pre2~4
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=a1e446a21e19c936771800c76baba2a9c8389ac6;p=mikachu%2Fopenbox.git

Merge branch 'backport' into 3.4-working

Conflicts:

	openbox/openbox.h
---

a1e446a21e19c936771800c76baba2a9c8389ac6
diff --cc openbox/openbox.h
index 48c7c822,06d38297..2c0f38c6
--- a/openbox/openbox.h
+++ b/openbox/openbox.h
@@@ -51,14 -51,15 +51,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);