Page MenuHomeFreeBSD
Differential D20830 Diff 80367 audio/libcanberra/files/patch-dont-assume-x11

Changeset View

Standalone View

View Options

audio/libcanberra/files/patch-dont-assume-x11

gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland
Obtained from: upstream (c0620e432650e81062c1967cc669829dbd29b310) Obtained from: upstream (c0620e432650e81062c1967cc669829dbd29b310)
--- src/canberra-gtk-module.c.orig --- src/canberra-gtk-module.c.orig 2012-05-15 10:23:57 UTC
+++ src/canberra-gtk-module.c +++ src/canberra-gtk-module.c
@@ -307,6 +307,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) { @@ -307,6 +307,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindo
guchar *data = NULL; guchar *data = NULL;
gint ret = -1; gint ret = -1;
+#ifdef GDK_IS_X11_DISPLAY +#ifdef GDK_IS_X11_DISPLAY
+ if (!GDK_IS_X11_DISPLAY(d)) + if (!GDK_IS_X11_DISPLAY(d))
+ return 0; + return 0;
+#endif +#endif
+ +
if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w), if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"), gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"),
0, G_MAXLONG, False, XA_CARDINAL, &type_return, 0, G_MAXLONG, False, XA_CARDINAL, &type_return,
@@ -335,6 +340,11 @@ static gint display_get_desktop(GdkDisplay *d) { @@ -335,6 +340,11 @@ static gint display_get_desktop(GdkDisplay *d) {
guchar *data = NULL; guchar *data = NULL;
gint ret = -1; gint ret = -1;
+#ifdef GDK_IS_X11_DISPLAY +#ifdef GDK_IS_X11_DISPLAY
+ if (!GDK_IS_X11_DISPLAY(d)) + if (!GDK_IS_X11_DISPLAY(d))
+ return 0; + return 0;
+#endif +#endif
+ +
if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), DefaultRootWindow(GDK_DISPLAY_XDISPLAY(d)), if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), DefaultRootWindow(GDK_DISPLAY_XDISPLAY(d)),
gdk_x11_get_xatom_by_name_for_display(d, "_NET_CURRENT_DESKTOP"), gdk_x11_get_xatom_by_name_for_display(d, "_NET_CURRENT_DESKTOP"),
0, G_MAXLONG, False, XA_CARDINAL, &type_return, 0, G_MAXLONG, False, XA_CARDINAL, &type_return,
@@ -365,6 +375,11 @@ static gboolean window_is_xembed(GdkDisplay *d, GdkWindow *w) { @@ -364,6 +374,11 @@ static gboolean window_is_xembed(GdkDisplay *d, GdkWin
guchar *data = NULL;
gboolean ret = FALSE; gboolean ret = FALSE;
Atom xembed; Atom xembed;
+
+#ifdef GDK_IS_X11_DISPLAY +#ifdef GDK_IS_X11_DISPLAY
+ if (!GDK_IS_X11_DISPLAY(d)) + if (!GDK_IS_X11_DISPLAY(d))
+ return FALSE; + return FALSE;
+#endif +#endif
+
/* Gnome Panel applets are XEMBED windows. We need to make sure we /* Gnome Panel applets are XEMBED windows. We need to make sure we
* ignore them */ * ignore them */
--- src/canberra-gtk.c.orig 2010-09-28 13:55:03 UTC
--- src/canberra-gtk.c.orig
+++ src/canberra-gtk.c +++ src/canberra-gtk.c
@@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) { @@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindo
guchar *data = NULL; guchar *data = NULL;
gint ret = -1; gint ret = -1;
+#ifdef GDK_IS_X11_DISPLAY +#ifdef GDK_IS_X11_DISPLAY
+ if (!GDK_IS_X11_DISPLAY(d)) + if (!GDK_IS_X11_DISPLAY(d))
+ return 0; + return 0;
+#endif +#endif
+ +
if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w), if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"), gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"),
0, G_MAXLONG, False, XA_CARDINAL, &type_return, 0, G_MAXLONG, False, XA_CARDINAL, &type_return,