From: Dana Jansens <danakj@orodu.net>
Date: Thu, 17 Dec 2009 23:32:10 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.9~1
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=29ecb62a556e7223a936020919469badf18a958b;p=dana%2Fopenbox.git

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

29ecb62a556e7223a936020919469badf18a958b
diff --cc openbox/focus_cycle_popup.h
index 4e8c775f,19279a62..731165b5
--- a/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