summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/canberra-gtk-module.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c
index 63f9465..e777121 100644
--- a/src/canberra-gtk-module.c
+++ b/src/canberra-gtk-module.c
@@ -370,6 +370,8 @@ static gboolean window_is_xembed(GdkDisplay *d, GdkWindow *w) {
xembed = gdk_x11_get_xatom_by_name_for_display(d, "_XEMBED_INFO");
+ /* be robust against not existing XIDs (LP: #834403) */
+ gdk_error_trap_push();
if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
xembed,
0, 2, False, xembed, &type_return,
@@ -377,6 +379,7 @@ static gboolean window_is_xembed(GdkDisplay *d, GdkWindow *w) {
&data) != Success) {
return FALSE;
}
+ gdk_error_trap_pop_ignored();
if (type_return == xembed && format_return == 32 && data)
ret = TRUE;