Merge branch 'backport' into 3.4-working

diff --cc openbox/client.c
Simple merge

diff --cc openbox/client.h
Simple merge

diff --cc openbox/focus_cycle_popup.h
index 731165b,b4c9e35..b6d8930
--- 1/openbox/focus_cycle_popup.h
--- 2/openbox/focus_cycle_popup.h
+++ b/openbox/focus_cycle_popup.h
@@@ -37,9 -37,15 +37,15 @@@ void focus_cycle_popup_single_show(stru
                                     gboolean all_desktops,
                                     gboolean dock_windows,
                                     gboolean desktop_windows);
 -void focus_cycle_popup_single_hide();
 +void focus_cycle_popup_single_hide(void);
  
- /*! Returns TRUE if the popup is showing the client, otherwise FALSE. */
- gboolean focus_cycle_popup_is_showing(struct _ObClient *client);
+ /*! Reverts from the current @target to a new focus cycle target window */
+ struct _ObClient* focus_cycle_popup_revert(struct _ObClient *target);
+ /*! Redraws the focus cycle popup */
+ void focus_cycle_popup_refresh(struct _ObClient *target,
+                                gboolean iconic_windows,
+                                gboolean all_desktops,
+                                gboolean dock_windows,
+                                gboolean desktop_windows);
  
  #endif