x11: Move cursor API into gdkx11cursor.h

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

diff --git a/gdk/x11/gdkasync.c b/gdk/x11/gdkasync.c
index e412ed2f7e4eccf48643e9a1ef3e06d60e856783..b86218480cc937c5f0e959805eb590009b73c6e6 100644 (file)
--- a/gdk/x11/gdkasync.c
+++ b/gdk/x11/gdkasync.c
@@ -44,13 +44,16 @@ in this Software without prior written authorization from The Open Group.
 
 */
 #include "config.h"
+
+#include "gdkasync.h"
+#include "gdkprivate-x11.h"
+
 #ifdef NEED_XIPROTO_H_FOR_XREPLY
 #include <X11/extensions/XIproto.h>
 #endif
+
 #include <X11/Xlibint.h>
-#include "gdkasync.h"
-#include "gdkx.h"
-#include "gdkalias.h"
+
 
 typedef struct _ChildInfoChildState ChildInfoChildState;
 typedef struct _ChildInfoState ChildInfoState;
@@ -650,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 ();
+  gdk_x11_display_error_trap_pop_ignored (display);
   if (!result)
     {
       g_free (state.children);
@@ -840,6 +843,3 @@ _gdk_x11_roundtrip_async (GdkDisplay           *display,
   UnlockDisplay(dpy);
   SyncHandle();
 }
-
-#define __GDK_ASYNC_C__
-#include "gdkaliasdef.c"