[gnome-desktop] Make error traps use the awesome new GTK APIs

[Benjamin Otte <otte src gnome org>]

commit da4d293870762064285231fba3a2a7c3c0d25838
Author: Benjamin Otte <otte redhat com>
Date:   Wed Sep 29 17:08:38 2010 +0200

    Make error traps use the awesome new GTK APIs

 libgnome-desktop/gnome-bg.c |    5 ++---
 libgnome-desktop/gnome-rr.c |    6 ++----
 2 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/libgnome-desktop/gnome-bg.c b/libgnome-desktop/gnome-bg.c
index 8364052..4507e8f 100644
--- a/libgnome-desktop/gnome-bg.c
+++ b/libgnome-desktop/gnome-bg.c
@@ -1290,7 +1290,7 @@ gnome_bg_get_surface_from_root (GdkScreen *screen)
                                                                    w_ret, h_ret);
                 }
 
-		gdk_error_trap_pop ();
+                gdk_error_trap_pop_ignored ();
 	}
 
 	width = gdk_screen_get_width (screen);
@@ -1361,8 +1361,7 @@ gnome_bg_set_root_pixmap_id (GdkScreen       *screen,
 		    nitems == 1) {
 			gdk_error_trap_push ();
 			XKillClient (display, *(Pixmap *)data_esetroot);
-			gdk_flush ();
-			gdk_error_trap_pop ();
+                        gdk_error_trap_pop_ignored ();
 		}
 		XFree (data_esetroot);
 	}
diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
index e1dacac..fecd24b 100644
--- a/libgnome-desktop/gnome-rr.c
+++ b/libgnome-desktop/gnome-rr.c
@@ -486,8 +486,7 @@ fill_out_screen_info (Display *xdisplay,
     if (info->screen->rr_major_version == 1 && info->screen->rr_minor_version >= 3) {
         gdk_error_trap_push ();
         info->primary = XRRGetOutputPrimary (xdisplay, xroot);
-	gdk_flush ();
-	gdk_error_trap_pop (); /* ignore error */
+	gdk_error_trap_pop_ignored ();
     }
 #endif
 
@@ -746,8 +745,7 @@ gnome_rr_screen_set_size (GnomeRRScreen *screen,
     gdk_error_trap_push ();
     XRRSetScreenSize (screen->xdisplay, screen->xroot,
 		      width, height, mm_width, mm_height);
-    gdk_flush ();
-    gdk_error_trap_pop (); /* ignore error */
+    gdk_error_trap_pop_ignored ();
 #endif
 }