demos/pixbuf-demo.c demos/testpixbuf.c demos/gtk-demo/pixbufs.c sync with

Fri Jan 31 17:48:53 2003  Manish Singh  <yosh@gimp.org>

        * demos/pixbuf-demo.c
        * demos/testpixbuf.c
        * demos/gtk-demo/pixbufs.c
        * tests/testtext.c: sync with HEAD (removed gtk_timeout_* usage)

9 files changed, 41 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 37f172704..d20e17e22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jan 31 17:48:53 2003  Manish Singh  <yosh@gimp.org>
+                                                                                
+        * demos/pixbuf-demo.c
+        * demos/testpixbuf.c
+        * demos/gtk-demo/pixbufs.c
+	* tests/testtext.c: sync with HEAD (removed gtk_timeout_* usage)
+
 Fri Jan 31 17:23:59 2003  Manish Singh  <yosh@gimp.org>
 
 	* gtk/gtknotebook.c (gtk_notebook_remove_tab_label): set_state
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 37f172704..d20e17e22 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Fri Jan 31 17:48:53 2003  Manish Singh  <yosh@gimp.org>
+                                                                                
+        * demos/pixbuf-demo.c
+        * demos/testpixbuf.c
+        * demos/gtk-demo/pixbufs.c
+	* tests/testtext.c: sync with HEAD (removed gtk_timeout_* usage)
+
 Fri Jan 31 17:23:59 2003  Manish Singh  <yosh@gimp.org>
 
 	* gtk/gtknotebook.c (gtk_notebook_remove_tab_label): set_state
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 37f172704..d20e17e22 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Fri Jan 31 17:48:53 2003  Manish Singh  <yosh@gimp.org>
+                                                                                
+        * demos/pixbuf-demo.c
+        * demos/testpixbuf.c
+        * demos/gtk-demo/pixbufs.c
+	* tests/testtext.c: sync with HEAD (removed gtk_timeout_* usage)
+
 Fri Jan 31 17:23:59 2003  Manish Singh  <yosh@gimp.org>
 
 	* gtk/gtknotebook.c (gtk_notebook_remove_tab_label): set_state
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 37f172704..d20e17e22 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Fri Jan 31 17:48:53 2003  Manish Singh  <yosh@gimp.org>
+                                                                                
+        * demos/pixbuf-demo.c
+        * demos/testpixbuf.c
+        * demos/gtk-demo/pixbufs.c
+	* tests/testtext.c: sync with HEAD (removed gtk_timeout_* usage)
+
 Fri Jan 31 17:23:59 2003  Manish Singh  <yosh@gimp.org>
 
 	* gtk/gtknotebook.c (gtk_notebook_remove_tab_label): set_state
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 37f172704..d20e17e22 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Fri Jan 31 17:48:53 2003  Manish Singh  <yosh@gimp.org>
+                                                                                
+        * demos/pixbuf-demo.c
+        * demos/testpixbuf.c
+        * demos/gtk-demo/pixbufs.c
+	* tests/testtext.c: sync with HEAD (removed gtk_timeout_* usage)
+
 Fri Jan 31 17:23:59 2003  Manish Singh  <yosh@gimp.org>
 
 	* gtk/gtknotebook.c (gtk_notebook_remove_tab_label): set_state
diff --git a/demos/gtk-demo/pixbufs.c b/demos/gtk-demo/pixbufs.c
index 9a50d6f3c..d78885067 100644
--- a/demos/gtk-demo/pixbufs.c
+++ b/demos/gtk-demo/pixbufs.c
@@ -252,7 +252,7 @@ do_pixbufs (void)
 
 	  gtk_container_add (GTK_CONTAINER (window), da);
 
-	  timeout_id = gtk_timeout_add (FRAME_DELAY, timeout, NULL);
+	  timeout_id = g_timeout_add (FRAME_DELAY, timeout, NULL);
 	}
     }
 
diff --git a/demos/pixbuf-demo.c b/demos/pixbuf-demo.c
index 5425f4bc8..eaacf83f5 100644
--- a/demos/pixbuf-demo.c
+++ b/demos/pixbuf-demo.c
@@ -187,7 +187,7 @@ static guint timeout_id;
 static void
 destroy_cb (GtkObject *object, gpointer data)
 {
-	gtk_timeout_remove (timeout_id);
+	g_source_remove (timeout_id);
 	timeout_id = 0;
 
 	gtk_main_quit ();
@@ -225,7 +225,7 @@ main (int argc, char **argv)
 
 	gtk_container_add (GTK_CONTAINER (window), da);
 
-	timeout_id = gtk_timeout_add (FRAME_DELAY, timeout, NULL);
+	timeout_id = g_timeout_add (FRAME_DELAY, timeout, NULL);
 
 	gtk_widget_show_all (window);
 	gtk_main ();
diff --git a/demos/testpixbuf.c b/demos/testpixbuf.c
index 26bcd1d02..a40d3b202 100644
--- a/demos/testpixbuf.c
+++ b/demos/testpixbuf.c
@@ -626,7 +626,7 @@ main (int argc, char **argv)
 
 			status.readlen = readlen;
 
-                        status.timeout = gtk_timeout_add (100, update_timeout, &status);
+                        status.timeout = g_timeout_add (100, update_timeout, &status);
                 }
 #endif
 	}
diff --git a/tests/testtext.c b/tests/testtext.c
index c5175b2aa..fa59d3d01 100644
--- a/tests/testtext.c
+++ b/tests/testtext.c
@@ -2007,10 +2007,10 @@ buffer_set_colors (Buffer  *buffer,
   gdouble hue = 0.0;
 
   if (enabled && buffer->color_cycle_timeout == 0)
-    buffer->color_cycle_timeout = gtk_timeout_add (200, color_cycle_timeout, buffer);
+    buffer->color_cycle_timeout = g_timeout_add (200, color_cycle_timeout, buffer);
   else if (!enabled && buffer->color_cycle_timeout != 0)
     {
-      gtk_timeout_remove (buffer->color_cycle_timeout);
+      g_source_remove (buffer->color_cycle_timeout);
       buffer->color_cycle_timeout = 0;
     }