[gtk+/gtkobject-removal] Remove GtkOboject usage in tests

[Matthias Clasen <matthiasc src gnome org>]

commit cf7b15a245bba93c4a030a497139149e2081140e
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Sep 23 23:15:32 2010 -0400

    Remove GtkOboject usage in tests

 tests/testfilechooser.c   |    4 ++--
 tests/testgtk.c           |    6 +++---
 tests/testmerge.c         |    2 +-
 tests/testrecentchooser.c |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/tests/testfilechooser.c b/tests/testfilechooser.c
index 443f5c3..9591991 100644
--- a/tests/testfilechooser.c
+++ b/tests/testfilechooser.c
@@ -407,9 +407,9 @@ unmap_and_remap_cb (GtkButton *button,
 }
 
 static void
-kill_dependent (GtkWindow *win, GtkObject *dep)
+kill_dependent (GtkWindow *win, GtkWidget *dep)
 {
-  gtk_object_destroy (dep);
+  gtk_widget_destroy (dep);
   g_object_unref (dep);
 }
 
diff --git a/tests/testgtk.c b/tests/testgtk.c
index 39ac343..bfb3338 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -2321,7 +2321,7 @@ create_rotated_label (GtkWidget *widget)
 			     gtk_widget_get_screen (widget));
 
       g_signal_connect (window, "response",
-			G_CALLBACK (gtk_object_destroy), NULL);
+			G_CALLBACK (gtk_widget_destroy), NULL);
       g_signal_connect (window, "destroy",
 			G_CALLBACK (gtk_widget_destroyed), &window);
 
@@ -2455,7 +2455,7 @@ create_rotated_text (GtkWidget *widget)
 			     gtk_widget_get_screen (widget));
 
       g_signal_connect (window, "response",
-			G_CALLBACK (gtk_object_destroy), NULL);
+			G_CALLBACK (gtk_widget_destroy), NULL);
       g_signal_connect (window, "destroy",
 			G_CALLBACK (gtk_widget_destroyed), &window);
 
@@ -3752,7 +3752,7 @@ create_key_lookup (GtkWidget *widget)
 
       window_ptr = &window;
       g_object_add_weak_pointer (G_OBJECT (window), window_ptr);
-      g_signal_connect (window, "response", G_CALLBACK (gtk_object_destroy), NULL);
+      g_signal_connect (window, "response", G_CALLBACK (gtk_widget_destroy), NULL);
 
       gtk_widget_show_all (window);
     }
diff --git a/tests/testmerge.c b/tests/testmerge.c
index a9b1222..b1ca1e4 100644
--- a/tests/testmerge.c
+++ b/tests/testmerge.c
@@ -264,7 +264,7 @@ toggle_merge (GtkWidget    *button,
 					   "could not merge %s: %s", merge_ids[mergenum].filename,
 					   err->message);
 
-	  g_signal_connect (dialog, "response", G_CALLBACK (gtk_object_destroy), NULL);
+	  g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL);
 	  gtk_widget_show (dialog);
 
 	  g_clear_error (&err);
diff --git a/tests/testrecentchooser.c b/tests/testrecentchooser.c
index cb6968e..36a2c97 100644
--- a/tests/testrecentchooser.c
+++ b/tests/testrecentchooser.c
@@ -97,9 +97,9 @@ notify_multiple_cb (GtkWidget  *dialog,
 
 static void
 kill_dependent (GtkWindow *win,
-		GtkObject *dep)
+		GtkWidget *dep)
 {
-  gtk_object_destroy (dep);
+  gtk_widget_destroy (dep);
   g_object_unref (dep);
 }