Consistently use per-display error traps in the X11 backend

[~andy/gtk] / gdk / x11 / gdkasync.c

diff --git a/gdk/x11/gdkasync.c b/gdk/x11/gdkasync.c
index 2f591b090695821c2048a5445495e3ceb5d2a30c..795438b41142401dc03fbc623fb1633aacb1e341 100644 (file)
--- a/gdk/x11/gdkasync.c
+++ b/gdk/x11/gdkasync.c
@@ -653,12 +653,12 @@ _gdk_x11_get_window_child_info (GdkDisplay       *display,
   state.children = NULL;
   state.nchildren = 0;
 
-  gdk_error_trap_push ();
+  gdk_x11_display_error_trap_push (display);
   result = list_children_and_wm_state (dpy, window,
                                       win_has_wm_state ? wm_state_atom : None,
                                       &has_wm_state,
                                       &state.children, &state.nchildren);
-  gdk_error_trap_pop_ignored ();
+  gdk_x11_display_error_trap_pop_ignored (display);
   if (!result)
     {
       g_free (state.children);