From: Dana Jansens <danakj@orodu.net>
Date: Fri, 18 Dec 2009 16:39:56 +0000 (-0500)
Subject: Merge branch 'backport' into work
X-Git-Tag: mikabox-3.5-7~392
X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=commitdiff_plain;h=965ed8907a5dd81d5ffbc93b67a672fa78833854

Merge branch 'backport' into work

Conflicts:

	openbox/screen.c
---

965ed8907a5dd81d5ffbc93b67a672fa78833854
diff --cc openbox/focus_cycle_popup.h
index c289be3,19279a6..ad76491
--- a/openbox/focus_cycle_popup.h
+++ b/openbox/focus_cycle_popup.h
@@@ -44,6 -37,9 +44,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
diff --cc openbox/screen.c
index aabed21,d88be43..bb98e08
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@@ -30,12 -33,11 +30,13 @@@
  #include "frame.h"
  #include "event.h"
  #include "focus.h"
+ #include "focus_cycle.h"
  #include "popup.h"
 -#include "extensions.h"
  #include "render/render.h"
  #include "gettext.h"
 +#include "obt/display.h"
 +#include "obt/prop.h"
 +#include "obt/mainloop.h"
  
  #include <X11/Xlib.h>
  #ifdef HAVE_UNISTD_H