Replace a lot of idle and timeout calls by the new gdk_threads api.

[~andy/gtk] / gtk / gtkbutton.c

diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 4c51a47d68493229109b4033cdc053f5a8f2eb7a..471d73887db3b5a24f23119c736c5dc8606016db 100644 (file)
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -1490,12 +1490,8 @@ gtk_real_button_released (GtkButton *button)
 static gboolean
 button_activate_timeout (gpointer data)
 {
-  GDK_THREADS_ENTER ();
-  
   gtk_button_finish_activate (data, TRUE);
 
-  GDK_THREADS_LEAVE ();
-
   return FALSE;
 }
 
@@ -1520,7 +1516,7 @@ gtk_real_button_activate (GtkButton *button)
 
       gtk_grab_add (widget);
       
-      button->activate_timeout = g_timeout_add (ACTIVATE_TIMEOUT,
+      button->activate_timeout = gdk_threads_add_timeout (ACTIVATE_TIMEOUT,
                                                button_activate_timeout,
                                                button);
       button->button_down = TRUE;