From: Dana Jansens Date: Fri, 18 Dec 2009 16:39:56 +0000 (-0500) Subject: Merge branch 'backport' into work X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=965ed8907a5dd81d5ffbc93b67a672fa78833854;p=chaz%2Fopenbox Merge branch 'backport' into work Conflicts: openbox/screen.c --- 965ed8907a5dd81d5ffbc93b67a672fa78833854 diff --cc openbox/focus_cycle_popup.h index c289be36,19279a62..ad76491d --- 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 aabed214,d88be432..bb98e084 --- 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 #ifdef HAVE_UNISTD_H