Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Mon, 11 Jan 2010 20:14:36 +0000 (15:14 -0500)
committerDana Jansens <danakj@orodu.net>
Mon, 11 Jan 2010 20:14:36 +0000 (15:14 -0500)
1  2 
openbox/client.c
openbox/focus.h
openbox/focus_cycle_popup.h

Simple merge
diff --cc openbox/focus.h
Simple merge
@@@ -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