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

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

492e606f151879a7f9ffc687e188d5f5e5b20eb6
diff --cc openbox/focus_cycle_popup.h
index 731165b5,b4c9e350..b6d89303
--- a/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