Merge branch 'backport' into 3.4-working

diff --cc openbox/focus_cycle_popup.h
index 4e8c775f0a04f9c8c6951232a79e1f88dfac7355,19279a62d43f2232661cd4a7ab896139648ecb5b..731165b5c4165da1b016bb90f0e30145a7bb05e6
--- 1/openbox/focus_cycle_popup.h
--- 2/openbox/focus_cycle_popup.h
+++ b/openbox/focus_cycle_popup.h
@@@ -37,6 -37,9 +37,9 @@@ 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);
+ 
  #endif