diff --git a/src/gconf-bookmarks-dialog.c b/src/gconf-bookmarks-dialog.c
index 95d67b6..ca2d7dd 100644
--- a/src/gconf-bookmarks-dialog.c
+++ b/src/gconf-bookmarks-dialog.c
@@ -34,13 +34,13 @@ gconf_bookmarks_dialog_response (GtkDialog *dialog, gint response_id)
 }
 
 static void
-gconf_bookmarks_dialog_destroy (GtkObject *object)
+gconf_bookmarks_dialog_destroy (GtkWidget *widget)
 {
 	GConfClient *client;
 	GConfBookmarksDialog *dialog;
 	
 	client = gconf_client_get_default ();
-	dialog = GCONF_BOOKMARKS_DIALOG (object);
+	dialog = GCONF_BOOKMARKS_DIALOG (widget);
 	
 	if (dialog->notify_id != 0) {
 		gconf_client_notify_remove (client, dialog->notify_id);
@@ -50,8 +50,8 @@ gconf_bookmarks_dialog_destroy (GtkObject *object)
 
 	g_object_unref (client);
 	
-	if (GTK_OBJECT_CLASS (gconf_bookmarks_dialog_parent_class)->destroy) {
-		(* GTK_OBJECT_CLASS (gconf_bookmarks_dialog_parent_class)->destroy) (object);
+	if (GTK_WIDGET_CLASS (gconf_bookmarks_dialog_parent_class)->destroy) {
+		(* GTK_WIDGET_CLASS (gconf_bookmarks_dialog_parent_class)->destroy) (widget);
 	}
 }
 
@@ -59,12 +59,12 @@ static void
 gconf_bookmarks_dialog_class_init (GConfBookmarksDialogClass *klass)
 {
 	GtkDialogClass *dialog_class;
-	GtkObjectClass *object_class;
+	GtkWidgetClass *widget_class;
 
-	object_class = (GtkObjectClass *)klass;
+	widget_class = (GtkWidgetClass *)klass;
 	dialog_class = (GtkDialogClass *)klass;
 
-	object_class->destroy = gconf_bookmarks_dialog_destroy;
+	widget_class->destroy = gconf_bookmarks_dialog_destroy;
 	dialog_class->response = gconf_bookmarks_dialog_response;
 }
 
diff --git a/src/gconf-editor-application.c b/src/gconf-editor-application.c
index d1c63e0..d0d4e12 100644
--- a/src/gconf-editor-application.c
+++ b/src/gconf-editor-application.c
@@ -29,7 +29,7 @@
 static GSList *editor_windows = NULL;
 
 static void
-gconf_editor_application_window_destroyed (GtkObject *window)
+gconf_editor_application_window_destroyed (GtkWidget *window)
 {
 	editor_windows = g_slist_remove (editor_windows, window);
 
@@ -48,7 +48,7 @@ gconf_editor_application_create_editor_window (int type)
 	gconfwindow = GCONF_EDITOR_WINDOW (window);
 
 	if (gconfwindow->client == NULL) {
-		gconf_editor_application_window_destroyed (GTK_OBJECT (window));
+		gconf_editor_application_window_destroyed (GTK_WIDGET (window));
 		return NULL;
 	}
 
diff --git a/src/gedit-output-window.c b/src/gedit-output-window.c
index 18b6dc9..ba99cd3 100644
--- a/src/gedit-output-window.c
+++ b/src/gedit-output-window.c
@@ -68,7 +68,7 @@ enum
 
 
 static void gedit_output_window_finalize 	(GObject 	*object);
-static void gedit_output_window_destroy	 	(GtkObject 	*object);
+static void gedit_output_window_destroy	 	(GtkWidget 	*widget);
 
 G_DEFINE_TYPE(GeditOutputWindow, gedit_output_window, GTK_TYPE_HBOX)
 
@@ -79,7 +79,7 @@ gedit_output_window_class_init (GeditOutputWindowClass *klass)
 
    	object_class->finalize = gedit_output_window_finalize;
 	
-	GTK_OBJECT_CLASS (klass)->destroy = gedit_output_window_destroy;
+	GTK_WIDGET_CLASS (klass)->destroy = gedit_output_window_destroy;
 
 	signals[CLOSE_REQUESTED] = 
 		g_signal_new ("close_requested",
@@ -494,9 +494,9 @@ gedit_output_window_finalize (GObject *object)
 }
 
 static void 
-gedit_output_window_destroy (GtkObject *object)
+gedit_output_window_destroy (GtkWidget *widget)
 {
-	GTK_OBJECT_CLASS (gedit_output_window_parent_class)->destroy (object);
+	GTK_WIDGET_CLASS (gedit_output_window_parent_class)->destroy (widget);
 }
 
 GtkWidget *
