HCoop / jackhill / guix / guix.git / blame
| Commit | Line | Data |
|---|---|---|
| ec82d585 JL |
1 | # This patch comes from upstream commit c0620e432650e81062c1967cc669829dbd29b310. |
| 2 | # gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland | |
| 3 | ||
| 4 | --- src/canberra-gtk-module.c.orig | |
| 5 | +++ src/canberra-gtk-module.c | |
| 6 | @@ -307,6 +307,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) { | |
| 7 | guchar *data = NULL; | |
| 8 | gint ret = -1; | |
| 9 | ||
| 10 | +#ifdef GDK_IS_X11_DISPLAY | |
| 11 | + if (!GDK_IS_X11_DISPLAY(d)) | |
| 12 | + return 0; | |
| 13 | +#endif | |
| 14 | + | |
| 15 | if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w), | |
| 16 | gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"), | |
| 17 | 0, G_MAXLONG, False, XA_CARDINAL, &type_return, | |
| 18 | @@ -335,6 +340,11 @@ static gint display_get_desktop(GdkDisplay *d) { | |
| 19 | guchar *data = NULL; | |
| 20 | gint ret = -1; | |
| 21 | ||
| 22 | +#ifdef GDK_IS_X11_DISPLAY | |
| 23 | + if (!GDK_IS_X11_DISPLAY(d)) | |
| 24 | + return 0; | |
| 25 | +#endif | |
| 26 | + | |
| 27 | if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), DefaultRootWindow(GDK_DISPLAY_XDISPLAY(d)), | |
| 28 | gdk_x11_get_xatom_by_name_for_display(d, "_NET_CURRENT_DESKTOP"), | |
| 29 | 0, G_MAXLONG, False, XA_CARDINAL, &type_return, | |
| 30 | @@ -365,6 +375,11 @@ static gboolean window_is_xembed(GdkDisplay *d, GdkWindow *w) { | |
| 31 | gboolean ret = FALSE; | |
| 32 | Atom xembed; | |
| 33 | ||
| 34 | +#ifdef GDK_IS_X11_DISPLAY | |
| 35 | + if (!GDK_IS_X11_DISPLAY(d)) | |
| 36 | + return FALSE; | |
| 37 | +#endif | |
| 38 | + | |
| 39 | /* Gnome Panel applets are XEMBED windows. We need to make sure we | |
| 40 | * ignore them */ | |
| 41 | ||
| 42 | --- src/canberra-gtk.c.orig | |
| 43 | +++ src/canberra-gtk.c | |
| 44 | @@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) { | |
| 45 | guchar *data = NULL; | |
| 46 | gint ret = -1; | |
| 47 | ||
| 48 | +#ifdef GDK_IS_X11_DISPLAY | |
| 49 | + if (!GDK_IS_X11_DISPLAY(d)) | |
| 50 | + return 0; | |
| 51 | +#endif | |
| 52 | + | |
| 53 | if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w), | |
| 54 | gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"), | |
| 55 | 0, G_MAXLONG, False, XA_CARDINAL, &type_return, |