diff --git a/ChangeLog b/ChangeLog
index 92151596ef..35ee784d09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-04  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtktooltip.c (tooltip_browse_mode_expired),
+	(gtk_tooltip_hide_tooltip), (tooltip_popup_timeout),
+	(gtk_tooltip_start_delay): use new gdk_threads API.
+
 2007-04-03  Behdad Esfahbod  <behdad@gnome.org>
 
 	* gtk/gtksettings.c (settings_update_font_options): Don't set
diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index a001045728..2a4228963b 100644
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -526,8 +526,6 @@ tooltip_browse_mode_expired (gpointer data)
 {
   GtkTooltip *tooltip;
 
-  GDK_THREADS_ENTER ();
-
   tooltip = GTK_TOOLTIP (data);
 
   tooltip->browse_mode_enabled = FALSE;
@@ -537,8 +535,6 @@ tooltip_browse_mode_expired (gpointer data)
   g_object_set_data (G_OBJECT (gtk_widget_get_display (tooltip->window)),
 		     "gdk-display-current-tooltip", NULL);
 
-  GDK_THREADS_LEAVE ();
-
   return FALSE;
 }
 
@@ -763,10 +759,10 @@ gtk_tooltip_hide_tooltip (GtkTooltip *tooltip)
        */
       if (!tooltip->browse_mode_timeout_id)
 	tooltip->browse_mode_timeout_id =
-	  g_timeout_add_full (0, timeout,
-			      tooltip_browse_mode_expired,
-			      g_object_ref (tooltip),
-			      g_object_unref);
+	  gdk_threads_add_timeout_full (0, timeout,
+					tooltip_browse_mode_expired,
+					g_object_ref (tooltip),
+					g_object_unref);
     }
   else
     {
@@ -790,8 +786,6 @@ tooltip_popup_timeout (gpointer data)
   GdkDisplay *display;
   GtkTooltip *tooltip;
 
-  GDK_THREADS_ENTER ();
-
   display = GDK_DISPLAY_OBJECT (data);
 
   gtk_tooltip_show_tooltip (display);
@@ -800,8 +794,6 @@ tooltip_popup_timeout (gpointer data)
 			       "gdk-display-current-tooltip");
   tooltip->timeout_id = 0;
 
-  GDK_THREADS_LEAVE ();
-
   return FALSE;
 }
 
@@ -828,10 +820,10 @@ gtk_tooltip_start_delay (GdkDisplay *display)
   else
     g_object_get (settings, "gtk-tooltip-timeout", &timeout, NULL);
 
-  tooltip->timeout_id = g_timeout_add_full (0, timeout,
-					    tooltip_popup_timeout,
-					    g_object_ref (display),
-					    g_object_unref);
+  tooltip->timeout_id = gdk_threads_add_timeout_full (0, timeout,
+						      tooltip_popup_timeout,
+						      g_object_ref (display),
+						      g_object_unref);
 }
 
 void