From: Dana Jansens <danakj@orodu.net>
Date: Mon, 11 Jan 2010 20:14:36 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.11~14
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=6f6e6e6345ecd7b2b4014b1b3fd9de6582df1ef6;p=dana%2Fopenbox.git

Merge branch 'backport' into 3.4-working
---

6f6e6e6345ecd7b2b4014b1b3fd9de6582df1ef6
diff --cc openbox/focus_cycle_popup.h
index b6d89303,934d9a67..88c2f537
--- a/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