[gnome-session] gsm: Update for gdk_error_trap_*() API changes

[Vincent Untz <vuntz src gnome org>]

commit ad1803ba68389e6346090030ea9ffb93e3e9d2f6
Author: Vincent Untz <vuntz gnome org>
Date:   Mon Oct 4 23:59:29 2010 +0200

    gsm: Update for gdk_error_trap_*() API changes

 gnome-session/gsm-inhibit-dialog.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/gnome-session/gsm-inhibit-dialog.c b/gnome-session/gsm-inhibit-dialog.c
index f1e5d97..4444d27 100644
--- a/gnome-session/gsm-inhibit-dialog.c
+++ b/gnome-session/gsm-inhibit-dialog.c
@@ -437,10 +437,9 @@ get_pixbuf_for_window (GdkDisplay *gdkdisplay,
         pixbuf = pixbuf_get_from_pixmap (display, xpixmap, width, height);
 
         if (xpixmap != None) {
-                gdk_error_trap_push ();
+                gdk_x11_display_error_trap_push (gdkdisplay);
                 XFreePixmap (display, xpixmap);
-                gdk_display_sync (gdkdisplay);
-                gdk_error_trap_pop ();
+                gdk_x11_display_error_trap_pop_ignored (gdkdisplay);
         }
 
         if (pixbuf != NULL) {
@@ -974,7 +973,7 @@ gsm_inhibit_dialog_constructor (GType                  type,
 #ifdef HAVE_XRENDER
         gdkdisplay = gdk_display_get_default ();
 
-        gdk_error_trap_push ();
+        gdk_x11_display_error_trap_push (gdkdisplay);
         if (XRenderQueryExtension (GDK_DISPLAY_XDISPLAY (gdkdisplay), &dialog->priv->xrender_event_base, &dialog->priv->xrender_error_base)) {
                 g_debug ("GsmInhibitDialog: Initialized XRender extension");
                 dialog->priv->have_xrender = TRUE;
@@ -983,7 +982,7 @@ gsm_inhibit_dialog_constructor (GType                  type,
                 dialog->priv->have_xrender = FALSE;
         }
         gdk_display_sync (gdkdisplay);
-        gdk_error_trap_pop ();
+        gdk_x11_display_error_trap_pop_ignored (gdkdisplay);
 #endif /* HAVE_XRENDER */
 
         /* FIXME: turn this on when it is ready */