Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Fri, 18 Dec 2009 16:39:56 +0000 (11:39 -0500)
committerDana Jansens <danakj@orodu.net>
Fri, 18 Dec 2009 16:39:56 +0000 (11:39 -0500)
Conflicts:

openbox/screen.c

1  2 
openbox/event.c
openbox/focus_cycle.c
openbox/focus_cycle_popup.c
openbox/focus_cycle_popup.h
openbox/screen.c

diff --cc openbox/event.c
Simple merge
Simple merge
Simple merge
@@@ -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
  #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