diff --git a/ChangeLog b/ChangeLog
index ddbbeddb04..546dc7778a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Dec 29 12:22:22 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkuimanager.c (do_updates): 
+	* gtk/gtktoolbar.c (slide_idle_handler): 
+	* gtk/gtkdnd.c (gtk_drag_update_idle): 
+
+	Add GDK_THREADS_ENTER()/GDK_THREADS_LEAVE() pairs around idle
+	functions. (#130157, patch from Olexiy Avramchenko).
+	
 2003-12-29  Anders Carlsson  <andersca@gnome.org>
 
 	* gtk/gtkradiotoolbutton.c:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ddbbeddb04..546dc7778a 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Mon Dec 29 12:22:22 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkuimanager.c (do_updates): 
+	* gtk/gtktoolbar.c (slide_idle_handler): 
+	* gtk/gtkdnd.c (gtk_drag_update_idle): 
+
+	Add GDK_THREADS_ENTER()/GDK_THREADS_LEAVE() pairs around idle
+	functions. (#130157, patch from Olexiy Avramchenko).
+	
 2003-12-29  Anders Carlsson  <andersca@gnome.org>
 
 	* gtk/gtkradiotoolbutton.c:
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ddbbeddb04..546dc7778a 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Mon Dec 29 12:22:22 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkuimanager.c (do_updates): 
+	* gtk/gtktoolbar.c (slide_idle_handler): 
+	* gtk/gtkdnd.c (gtk_drag_update_idle): 
+
+	Add GDK_THREADS_ENTER()/GDK_THREADS_LEAVE() pairs around idle
+	functions. (#130157, patch from Olexiy Avramchenko).
+	
 2003-12-29  Anders Carlsson  <andersca@gnome.org>
 
 	* gtk/gtkradiotoolbutton.c:
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ddbbeddb04..546dc7778a 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Mon Dec 29 12:22:22 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkuimanager.c (do_updates): 
+	* gtk/gtktoolbar.c (slide_idle_handler): 
+	* gtk/gtkdnd.c (gtk_drag_update_idle): 
+
+	Add GDK_THREADS_ENTER()/GDK_THREADS_LEAVE() pairs around idle
+	functions. (#130157, patch from Olexiy Avramchenko).
+	
 2003-12-29  Anders Carlsson  <andersca@gnome.org>
 
 	* gtk/gtkradiotoolbutton.c:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ddbbeddb04..546dc7778a 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Mon Dec 29 12:22:22 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* gtk/gtkuimanager.c (do_updates): 
+	* gtk/gtktoolbar.c (slide_idle_handler): 
+	* gtk/gtkdnd.c (gtk_drag_update_idle): 
+
+	Add GDK_THREADS_ENTER()/GDK_THREADS_LEAVE() pairs around idle
+	functions. (#130157, patch from Olexiy Avramchenko).
+	
 2003-12-29  Anders Carlsson  <andersca@gnome.org>
 
 	* gtk/gtkradiotoolbutton.c:
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 4fecbf6a02..7994635c3a 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -3147,6 +3147,8 @@ gtk_drag_update_idle (gpointer data)
   GdkDragAction possible_actions;
   guint32 time;
 
+  GDK_THREADS_ENTER ();
+
   info->update_idle = 0;
     
   time = gtk_drag_get_event_time (info->last_event);
@@ -3176,6 +3178,8 @@ gtk_drag_update_idle (gpointer data)
   if (selection)
     gtk_drag_source_check_selection (info, selection, time);
 
+  GDK_THREADS_LEAVE ();
+
   return FALSE;
 }
 
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index e0fe4ae939..d4af5cc1c8 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -1058,9 +1058,13 @@ static gboolean
 slide_idle_handler (gpointer data)
 {
   GtkToolbar *toolbar = data;
-  GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+  GtkToolbarPrivate *priv;
   GList *list;
 
+  GDK_THREADS_ENTER ();
+
+  priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
+
   if (priv->need_sync)
     {
       gdk_flush ();
@@ -1083,13 +1087,16 @@ slide_idle_handler (gpointer data)
 	   GTK_WIDGET_CHILD_VISIBLE (content->item)))
 	{
 	  gtk_widget_queue_resize_no_redraw (GTK_WIDGET (toolbar));
+
+	  GDK_THREADS_LEAVE ();
 	  return TRUE;
 	}
     }
 
   priv->is_sliding = FALSE;
   priv->idle_id = 0;
-  
+
+  GDK_THREADS_LEAVE();
   return FALSE;
 }
 
diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index 420a75a12a..1178071343 100644
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -2243,6 +2243,8 @@ update_node (GtkUIManager *self,
 static gboolean
 do_updates (GtkUIManager *self)
 {
+  GDK_THREADS_ENTER ();
+
   /* this function needs to check through the tree for dirty nodes.
    * For such nodes, it needs to do the following:
    *
@@ -2259,6 +2261,8 @@ do_updates (GtkUIManager *self)
 
   self->private_data->update_tag = 0;
 
+  GDK_THREADS_LEAVE ();
+
   return FALSE;
 }