[gtk+/treeview-refactor] GtkSocket: Add error trap around call to XFixesChangeSaveSet()

[Tristan Van Berkom <tvb src gnome org>]

commit d8fdbd8b72adc3aa119890aeb6ba17766e0094b6
Author: Owen W. Taylor <otaylor fishsoup net>
Date:   Wed Oct 27 12:40:59 2010 -0400

    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 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/gtk/gtksocket-x11.c b/gtk/gtksocket-x11.c
index a1a32e2..00a3ce8 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,