Merge branch 'backport' into 3.4-working

Conflicts:

	openbox/openbox.h

diff --cc openbox/openbox.c
Simple merge

diff --cc openbox/openbox.h
index 48c7c82248b710b22ad3c2ab889604f2cc9cec2f,06d38297270bc208215b362d91f79af7cfa328ff..2c0f38c6d0b21076a2f321c1c55198bca3481a1c
--- 1/openbox/openbox.h
--- 2/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);