diff --git a/ChangeLog b/ChangeLog
index 67427ca9ae..6eb5fa128b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-20  Mikael Hallendal  <micke@imendio.com>
+
+	* tests/testthreads.c: Use g_signal_connect instead of
+	gtk_signal_connect.
+
+	* demos/testgtk/main.c: switched to use GSignal instead of GtkSignal.
+	While the code is not built, people may still look at it.
+
 2008-06-20  Kjartan Maraas  <kmaraas@gnome.org>
 
 	reviewed by: <Carlos Garnacho <garnacho@gnome.org>
diff --git a/demos/testgtk/main.c b/demos/testgtk/main.c
index 9c479dee61..f21c0f80a8 100644
--- a/demos/testgtk/main.c
+++ b/demos/testgtk/main.c
@@ -227,8 +227,7 @@ button_press_event_cb (GtkTreeView    *tree_view,
 	  gtk_tree_path_free (path);
 	}
 
-      gtk_signal_emit_stop_by_name (GTK_OBJECT (tree_view),
-				    "button_press_event");
+      g_signal_stop_emission_by_name (tree_view, "button-press-event");
       return TRUE;
     }
   
@@ -329,8 +328,8 @@ create_tree (void)
   gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view),
 			       GTK_TREE_VIEW_COLUMN (column));
 
-  gtk_signal_connect (GTK_OBJECT (selection), "selection_changed", selection_cb, model);
-  gtk_signal_connect (GTK_OBJECT (tree_view), "button_press_event", GTK_SIGNAL_FUNC (button_press_event_cb), model);
+  g_signal_connect (selection, "selection-changed", selection_cb, model);
+  g_signal_connect (tree_view, "button-press-event", G_CALLBACK (button_press_event_cb), model);
 
   return tree_view;
 }
@@ -347,8 +346,8 @@ main (int argc, char **argv)
   gtk_init (&argc, &argv);
   
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_signal_connect (GTK_OBJECT (window), "destroy",
-		      GTK_SIGNAL_FUNC (gtk_main_quit), NULL);
+  g_signal_connect (window, "destroy",
+                    G_CALLBACK (gtk_main_quit), NULL);
 
   hbox = gtk_hbox_new (FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), hbox);
diff --git a/tests/testthreads.c b/tests/testthreads.c
index f3aaeafa36..8bc996bfde 100644
--- a/tests/testthreads.c
+++ b/tests/testthreads.c
@@ -69,8 +69,8 @@ counter (void *data)
 
   vbox = gtk_vbox_new (FALSE, 0);
 
-  gtk_signal_connect (GTK_OBJECT (window), "delete_event",
-		      GTK_SIGNAL_FUNC (delete_cb), &flag);
+  g_signal_connect (window, "delete-event",
+                    G_CALLBACK (delete_cb), &flag);
 
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
@@ -78,8 +78,8 @@ counter (void *data)
   gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 0);
 
   button = gtk_button_new_with_label ("Close");
-  gtk_signal_connect (GTK_OBJECT (button), "clicked",
-		      GTK_SIGNAL_FUNC (close_cb), &flag);
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (close_cb), &flag);
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
 
   gtk_widget_show_all (window);