From d8fdbd8b72adc3aa119890aeb6ba17766e0094b6 Mon Sep 17 00:00:00 2001
From: "Owen W. Taylor" <otaylor@fishsoup.net>
Date: Wed, 27 Oct 2010 12:40:59 -0400
Subject: [PATCH] GtkSocket: Add error trap around call to
 XFixesChangeSaveSet()

Previously any X error from XFixesChangeSaveSet() was being eaten
by the subsequent error trap when sending a client message. With
asynchronous error traps, that side effect no longer occurs, so
we need to add a proper error trap around the call to
XFixesChangeSaveSet().

https://bugzilla.gnome.org/show_bug.cgi?id=633274
---
 gtk/gtksocket-x11.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gtk/gtksocket-x11.c b/gtk/gtksocket-x11.c
index a1a32e229..00a3ce856 100644
--- a/gtk/gtksocket-x11.c
+++ b/gtk/gtksocket-x11.c
@@ -281,9 +281,11 @@ _gtk_socket_windowing_embed_notify (GtkSocket *socket)
 #ifdef HAVE_XFIXES
   GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (socket));
 
+  gdk_error_trap_push ();
   XFixesChangeSaveSet (GDK_DISPLAY_XDISPLAY (display),
 		       GDK_WINDOW_XWINDOW (socket->plug_window),
 		       SetModeInsert, SaveSetRoot, SaveSetUnmap);
+  gdk_error_trap_pop_ignore ();
 #endif
   _gtk_xembed_send_message (socket->plug_window,
 			    XEMBED_EMBEDDED_NOTIFY, 0,
-- 
2.43.2