diff --git a/ChangeLog b/ChangeLog
index 2e8be42682..eb9b4c906a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-09  Matthias Clasen <mclasen@redhat.com>
+
+	* gdk/x11/gdkasync.c: Fix the build
+
 2007-03-09  Matthias Clasen <mclasen@redhat.com>
 
 	* gtk/gtkfilesystemwin32.c (get_icon_path): Remove
diff --git a/gdk/x11/gdkasync.c b/gdk/x11/gdkasync.c
index 6336660061..468e818453 100644
--- a/gdk/x11/gdkasync.c
+++ b/gdk/x11/gdkasync.c
@@ -115,12 +115,16 @@ struct _SetInputFocusState
 static gboolean
 callback_idle (gpointer data)
 {
-  SendEventState *state = (SendEventState *)data;  
-  
-  state->callback (state->window, !state->have_error, state->data);
+  SendEventState *state;
 
+  GDK_THREADS_ENTER ();
+  
+  state = (SendEventState *)data;  
+  state->callback (state->window, !state->have_error, state->data);
   g_free (state);
 
+  GDK_THREADS_LEAVE ();
+
   return FALSE;
 }
 
@@ -159,7 +163,7 @@ send_event_handler (Display *dpy,
 	}
 
       if (state->callback)
-        gdk_threads_add_idle (callback_idle, state);
+        g_idle_add (callback_idle, state);
 
       DeqAsyncHandler(state->dpy, &state->async);