diff options
author | Michael Meeks <michael.meeks@suse.com> | 2012-11-09 16:16:40 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2012-11-10 00:18:15 +0100 |
commit | c0620e432650e81062c1967cc669829dbd29b310 (patch) | |
tree | 1630f35feb690378c6a20b8ec81ec6b183dda897 /src/canberra-gtk-module.c | |
parent | 5a71fffd3da981127d0a012dda1a1412acaee7d8 (diff) |
Diffstat (limited to 'src/canberra-gtk-module.c')
-rw-r--r-- | src/canberra-gtk-module.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c index 67791f0..c1532ab 100644 --- a/src/canberra-gtk-module.c +++ b/src/canberra-gtk-module.c @@ -307,6 +307,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) { guchar *data = NULL; gint ret = -1; +#ifdef GDK_IS_X11_DISPLAY + if (!GDK_IS_X11_DISPLAY(d)) + return 0; +#endif + if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w), gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"), 0, G_MAXLONG, False, XA_CARDINAL, &type_return, @@ -335,6 +340,11 @@ static gint display_get_desktop(GdkDisplay *d) { guchar *data = NULL; gint ret = -1; +#ifdef GDK_IS_X11_DISPLAY + if (!GDK_IS_X11_DISPLAY(d)) + return 0; +#endif + if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), DefaultRootWindow(GDK_DISPLAY_XDISPLAY(d)), gdk_x11_get_xatom_by_name_for_display(d, "_NET_CURRENT_DESKTOP"), 0, G_MAXLONG, False, XA_CARDINAL, &type_return, @@ -365,6 +375,11 @@ static gboolean window_is_xembed(GdkDisplay *d, GdkWindow *w) { gboolean ret = FALSE; Atom xembed; +#ifdef GDK_IS_X11_DISPLAY + if (!GDK_IS_X11_DISPLAY(d)) + return FALSE; +#endif + /* Gnome Panel applets are XEMBED windows. We need to make sure we * ignore them */ |