Consistently use per-display error traps in the X11 backend

2010-12-15 02:05:05 -05:00
parent 2d7583c0e3
commit fa33839d72
9 changed files with 137 additions and 131 deletions
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@ -355,9 +355,9 @@ gdk_x11_xatom_to_atom_for_display (GdkDisplay *display,
       * we take precautions
       */
      char *name;
-      gdk_error_trap_push ();
+      gdk_x11_display_error_trap_push (display);
      name = XGetAtomName (GDK_DISPLAY_XDISPLAY (display), xatom);
-      if (gdk_error_trap_pop ())
+      if (gdk_x11_display_error_trap_pop (display))
 	{
 	  g_warning (G_STRLOC " invalid X atom: %ld", xatom);
 	}