Lots of files. Another GtkObject -> GObject pass.

	* Lots of files.
	Another GtkObject -> GObject pass.

4 files changed, 13 insertions, 13 deletions

diff --git a/test/test-nautilus-preferences-change.c b/test/test-nautilus-preferences-change.c
index 120a670da..d4c526104 100644
--- a/test/test-nautilus-preferences-change.c
+++ b/test/test-nautilus-preferences-change.c
@@ -94,7 +94,7 @@ picker_new (const char *name,
 	
 	string_picker = eel_string_picker_new ();
 	eel_caption_set_title_label (EEL_CAPTION (string_picker), name);
-	g_signal_connect (G_OBJECT (string_picker), "changed", GTK_SIGNAL_FUNC (int_picker_changed_callback),
+	g_signal_connect (G_OBJECT (string_picker), "changed", G_CALLBACK (int_picker_changed_callback),
 			    (gpointer) name);
 	
 	eel_string_picker_set_string_list (EEL_STRING_PICKER (string_picker), entries);
@@ -118,7 +118,7 @@ user_level_picker_new (const char *name,
 	
 	string_picker = eel_string_picker_new ();
 	eel_caption_set_title_label (EEL_CAPTION (string_picker), name);
-	g_signal_connect (G_OBJECT (string_picker), "changed", GTK_SIGNAL_FUNC (user_level_picker_changed_callback),
+	g_signal_connect (G_OBJECT (string_picker), "changed", G_CALLBACK (user_level_picker_changed_callback),
 			    (gpointer) name);
 	
 	eel_string_picker_set_string_list (EEL_STRING_PICKER (string_picker), entries);
diff --git a/test/test-nautilus-smooth-graphics.c b/test/test-nautilus-smooth-graphics.c
index 82b8b7579..30b68c701 100644
--- a/test/test-nautilus-smooth-graphics.c
+++ b/test/test-nautilus-smooth-graphics.c
@@ -40,7 +40,7 @@ main (int argc, char * argv[])
 	nautilus_global_preferences_init ();
 
 	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	g_signal_connect (G_OBJECT (window), "delete_event", GTK_SIGNAL_FUNC (delete_event), NULL);
+	g_signal_connect (G_OBJECT (window), "delete_event", G_CALLBACK (delete_event), NULL);
 	
 	button = gtk_toggle_button_new_with_label ("Smooth Graphics");
 
@@ -51,7 +51,7 @@ main (int argc, char * argv[])
 
 	g_signal_connect (G_OBJECT (button),
 			    "toggled",
-			    GTK_SIGNAL_FUNC (button_toggled),
+			    G_CALLBACK (button_toggled),
 			    NULL);
 
 	eel_preferences_add_callback (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE, 
diff --git a/test/test-nautilus-wrap-table.c b/test/test-nautilus-wrap-table.c
index 4d7c7fe0b..dc48467ee 100644
--- a/test/test-nautilus-wrap-table.c
+++ b/test/test-nautilus-wrap-table.c
@@ -68,7 +68,7 @@ main (int argc, char* argv[])
 		}
 		
 		if (strcmp (emblem_name, "erase") == 0) {
-			gdk_pixbuf_unref (pixbuf);
+			g_object_unref (G_OBJECT (pixbuf));
 			g_free (label);
 			g_free (emblem_name);
 			continue;
@@ -76,10 +76,10 @@ main (int argc, char* argv[])
 		
 		button = eel_labeled_image_check_button_new (label, pixbuf);
 		g_free (label);
-		gdk_pixbuf_unref (pixbuf);
+		g_object_unref (G_OBJECT (pixbuf));
 
 		/* Attach parameters and signal handler. */
-		gtk_object_set_data_full (GTK_OBJECT (button),
+		g_object_set_data (G_OBJECT (button),
 					  "nautilus_property_name",
 					  emblem_name,
 					  g_free);
diff --git a/test/test.c b/test/test.c
index 73a67af21..5569134c4 100644
--- a/test/test.c
+++ b/test/test.c
@@ -60,7 +60,7 @@ test_window_new (const char *title, guint border_width)
 
 	g_signal_connect (G_OBJECT (window),
 			    "delete_event",
-			    GTK_SIGNAL_FUNC (test_delete_event),
+			    G_CALLBACK (test_delete_event),
 			    NULL);
 	
 	gtk_window_set_policy (GTK_WINDOW (window), TRUE, TRUE, FALSE);
@@ -130,7 +130,7 @@ test_pixbuf_new_named (const char *name, float scale)
 
 		scaled = gdk_pixbuf_scale_simple (pixbuf, width, height, GDK_INTERP_BILINEAR);
 
-		gdk_pixbuf_unref (pixbuf);
+		g_object_unref (G_OBJECT (pixbuf));
 
 		g_return_val_if_fail (scaled != NULL, NULL);
 
@@ -161,7 +161,7 @@ test_image_new (const char *pixbuf_name,
 
 		if (pixbuf != NULL) {
 			eel_image_set_pixbuf (EEL_IMAGE (image), pixbuf);
-			gdk_pixbuf_unref (pixbuf);
+			g_object_unref (G_OBJECT (pixbuf));
 		}
 	}
 
@@ -172,7 +172,7 @@ test_image_new (const char *pixbuf_name,
 
 		if (tile_pixbuf != NULL) {
 			eel_image_set_tile_pixbuf (EEL_IMAGE (image), tile_pixbuf);
-			gdk_pixbuf_unref (tile_pixbuf);
+			g_object_unref (G_OBJECT (tile_pixbuf));
 		}
 	}
 
@@ -210,7 +210,7 @@ test_label_new (const char *text,
 
 		if (tile_pixbuf != NULL) {
 			eel_label_set_tile_pixbuf (EEL_LABEL (label), tile_pixbuf);
-			gdk_pixbuf_unref (tile_pixbuf);
+			g_object_unref (G_OBJECT (tile_pixbuf));
 		}
 	}
 
@@ -363,5 +363,5 @@ test_pixbuf_draw_rectangle_tiled (GdkPixbuf *pixbuf,
 					     opacity,
 					     GDK_INTERP_NEAREST);
 
-	gdk_pixbuf_unref (tile_pixbuf);
+	g_object_unref (G_OBJECT (tile_pixbuf));
 }