diff options
author | davidovski <david@davidovski.xyz> | 2022-05-18 23:40:53 +0100 |
---|---|---|
committer | davidovski <david@davidovski.xyz> | 2022-05-18 23:40:53 +0100 |
commit | 3ed93901dda10d71a712922a78a8bd06b3b38da6 (patch) | |
tree | 20de8e99d0705934693760e0041a7f8966dce4ea /repo/media/libcanberra/dont-assume-all-GdkDisplays-are-GdkX11Displays.patch | |
parent | 0b977787374349328a21af0deade30d534cf3978 (diff) | |
parent | 4cfc98e1be889f359613a54010b67e13c673e4ab (diff) |
Merge branch 'master' of git.cheetah.remote:xilinux/buildfiles
Diffstat (limited to 'repo/media/libcanberra/dont-assume-all-GdkDisplays-are-GdkX11Displays.patch')
-rw-r--r-- | repo/media/libcanberra/dont-assume-all-GdkDisplays-are-GdkX11Displays.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/repo/media/libcanberra/dont-assume-all-GdkDisplays-are-GdkX11Displays.patch b/repo/media/libcanberra/dont-assume-all-GdkDisplays-are-GdkX11Displays.patch new file mode 100644 index 0000000..79ced10 --- /dev/null +++ b/repo/media/libcanberra/dont-assume-all-GdkDisplays-are-GdkX11Displays.patch @@ -0,0 +1,72 @@ +From c0620e432650e81062c1967cc669829dbd29b310 Mon Sep 17 00:00:00 2001 +From: Michael Meeks <michael.meeks@suse.com> +Date: Fri, 9 Nov 2012 16:16:40 +0000 +Subject: gtk: Don't assume all GdkDisplays are GdkX11Displays: + broadway/wayland + +--- + src/canberra-gtk-module.c | 15 +++++++++++++++ + src/canberra-gtk.c | 5 +++++ + 2 files changed, 20 insertions(+) + +Patch-Source: http://git.0pointer.net/libcanberra.git/commit/?id=c0620e432650e81062c1967cc669829dbd29b310 + +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 */ + +diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c +index 34446f5..08cb668 100644 +--- a/src/canberra-gtk.c ++++ b/src/canberra-gtk.c +@@ -185,6 +185,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, +-- +cgit v1.2.3 + |