Merge branch 'backport' into 3.4-working

diff --cc openbox/client.c
Simple merge

diff --cc openbox/focus.h
Simple merge

diff --cc openbox/focus_cycle_popup.h
index b6d893034e23c7f58d61bd737802166e57c5e9a1,934d9a67f139e9309b04c35a1df87f91fa669ca2..88c2f5372231006bde2821cf3b57ec1600fb593a
--- 1/openbox/focus_cycle_popup.h
--- 2/openbox/focus_cycle_popup.h
+++ b/openbox/focus_cycle_popup.h
@@@ -37,15 -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);
  
- /*! 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);
+ gboolean focus_cycle_popup_is_showing(struct _ObClient *c);
+ 
+ /*! Redraws the focus cycle popup, and returns the current target.  If
+     the target given to the function is no longer valid, this will return
+     a different target that is valid, and which should be considered the
+     current focus cycling target. */
+ struct _ObClient *focus_cycle_popup_refresh(struct _ObClient *target,
+                                             gboolean redraw);
  
  #endif