[src] don't use GtkObject

18 files changed, 52 insertions, 84 deletions

diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c
index b09106782..8316f3cc1 100644
--- a/src/file-manager/fm-desktop-icon-view.c
+++ b/src/file-manager/fm-desktop-icon-view.c
@@ -463,7 +463,8 @@ do_desktop_rescan (gpointer data)
 }
 
 static void
-done_loading (GtkObject *DirectoryView, FMDesktopIconView *desktop_icon_view)
+done_loading (NautilusDirectory *model,
+	      FMDesktopIconView *desktop_icon_view)
 {
 	struct stat buf;
 
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 93807e3ce..117485e9c 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -635,7 +635,7 @@ fm_directory_view_confirm_multiple (GtkWindow *parent_window,
 	g_free (detail);
 
 	response = gtk_dialog_run (dialog);
-	gtk_object_destroy (GTK_OBJECT (dialog));
+	gtk_widget_destroy (GTK_WIDGET (dialog));
 
 	return response == GTK_RESPONSE_YES;
 }
@@ -2014,7 +2014,7 @@ real_unmerge_menus (FMDirectoryView *view)
 }
 
 static void
-fm_directory_view_destroy (GtkObject *object)
+fm_directory_view_destroy (GtkWidget *object)
 {
 	FMDirectoryView *view;
 	GList *node, *next;
@@ -2075,7 +2075,7 @@ fm_directory_view_destroy (GtkObject *object)
 		view->details->directory_as_file = NULL;
 	}
 
-	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, destroy, (object));
 }
 
 static void
@@ -2653,7 +2653,7 @@ copy_move_done_callback (GHashTable *debuting_files, gpointer data)
 			 * operate on. The ADD_FILE signal is registered as G_SIGNAL_RUN_LAST, so we
 			 * must use connect_after.
 			 */
-			g_signal_connect_data (GTK_OBJECT (directory_view),
+			g_signal_connect_data (directory_view,
 					       "add_file",
 					       G_CALLBACK (debuting_files_add_file_callback),
 					       debuting_files_data,
@@ -10624,8 +10624,7 @@ fm_directory_view_class_init (FMDirectoryViewClass *klass)
 	G_OBJECT_CLASS (klass)->finalize = fm_directory_view_finalize;
 	G_OBJECT_CLASS (klass)->set_property = fm_directory_view_set_property;
 
-	GTK_OBJECT_CLASS (klass)->destroy = fm_directory_view_destroy;
-
+	widget_class->destroy = fm_directory_view_destroy;
 	widget_class->scroll_event = fm_directory_view_scroll_event;
 	widget_class->parent_set = fm_directory_view_parent_set;
 
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index 92e652a37..b49afc875 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -198,7 +198,7 @@ G_DEFINE_TYPE_WITH_CODE (FMIconView, fm_icon_view, FM_TYPE_DIRECTORY_VIEW,
 						fm_icon_view_iface_init));
 
 static void
-fm_icon_view_destroy (GtkObject *object)
+fm_icon_view_destroy (GtkWidget *object)
 {
 	FMIconView *icon_view;
 
@@ -223,7 +223,7 @@ fm_icon_view_destroy (GtkObject *object)
 		icon_view->details->icons_not_positioned = NULL;
 	}
 
-	GTK_OBJECT_CLASS (fm_icon_view_parent_class)->destroy (object);
+	GTK_WIDGET_CLASS (fm_icon_view_parent_class)->destroy (object);
 }
 
 
@@ -2629,8 +2629,6 @@ fm_icon_view_sort_directories_first_changed (FMDirectoryView *directory_view)
 	}
 }
 
-/* GtkObject methods. */
-
 static gboolean
 icon_view_can_accept_item (NautilusIconContainer *container,
 			   NautilusFile *target_item,
@@ -2933,8 +2931,7 @@ fm_icon_view_class_init (FMIconViewClass *klass)
 	G_OBJECT_CLASS (klass)->set_property = fm_icon_view_set_property;
 	G_OBJECT_CLASS (klass)->finalize = fm_icon_view_finalize;
 
-	GTK_OBJECT_CLASS (klass)->destroy = fm_icon_view_destroy;
-	
+	GTK_WIDGET_CLASS (klass)->destroy = fm_icon_view_destroy;
 	GTK_WIDGET_CLASS (klass)->screen_changed = fm_icon_view_screen_changed;
 	GTK_WIDGET_CLASS (klass)->scroll_event = fm_icon_view_scroll_event;
 	
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index 07a693635..e06c098ac 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -5070,13 +5070,6 @@ is_directory_ready_callback (NautilusFile *file,
 		
 		remove_pending (startup_data, FALSE, TRUE, TRUE);
 		
-/* FIXME bugzilla.gnome.org 42151:
- * See comment elsewhere in this file about bug 2151.
- */
-#ifdef UNDO_ENABLED
-		nautilus_undo_share_undo_manager (GTK_OBJECT (new_window),
-						  GTK_OBJECT (callback_data));
-#endif	
 		gtk_window_present (GTK_WINDOW (new_window));
 	}
 }
@@ -5193,7 +5186,7 @@ real_response (GtkDialog *dialog,
 }
 
 static void
-real_destroy (GtkObject *object)
+real_destroy (GtkWidget *object)
 {
 	FMPropertiesWindow *window;
 	GList *l;
@@ -5243,7 +5236,7 @@ real_destroy (GtkObject *object)
 		window->details->update_files_timeout_id = 0;
 	}
 
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
+	GTK_WIDGET_CLASS (parent_class)->destroy (object);
 }
 
 static void
@@ -5498,7 +5491,7 @@ fm_properties_window_class_init (FMPropertiesWindowClass *class)
 	GtkBindingSet *binding_set;
 
 	G_OBJECT_CLASS (class)->finalize = real_finalize;
-	GTK_OBJECT_CLASS (class)->destroy = real_destroy;
+	GTK_WIDGET_CLASS (class)->destroy = real_destroy;
 	GTK_DIALOG_CLASS (class)->response = real_response;
 
 	binding_set = gtk_binding_set_by_class (class);
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 0eb8495b9..a3ae81235 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -335,7 +335,7 @@ check_required_directories (NautilusApplication *application)
 
 		dialog = eel_show_error_dialog (error_string, detail_string, NULL);
 		/* We need the main event loop so the user has a chance to see the dialog. */
-		nautilus_main_event_loop_register (GTK_OBJECT (dialog));
+		nautilus_main_event_loop_register (GTK_WIDGET (dialog));
 
 		g_string_free (directories_as_string, TRUE);
 		g_free (error_string);
@@ -1295,7 +1295,7 @@ nautilus_application_close_all_spatial_windows (void)
 }
 
 static void
-nautilus_application_destroyed_window (GtkObject *object, NautilusApplication *application)
+nautilus_application_destroyed_window (GtkWidget *object, NautilusApplication *application)
 {
 	nautilus_application_window_list = g_list_remove (nautilus_application_window_list, object);
 }
diff --git a/src/nautilus-bookmarks-window.c b/src/nautilus-bookmarks-window.c
index 207da80eb..bb3e34e9a 100644
--- a/src/nautilus-bookmarks-window.c
+++ b/src/nautilus-bookmarks-window.c
@@ -223,9 +223,9 @@ static void
 edit_bookmarks_dialog_reset_signals (gpointer data,
 				     GObject *obj)
 {
-	g_signal_handler_disconnect (GTK_OBJECT (jump_button),
+	g_signal_handler_disconnect (jump_button,
 				     jump_button_signal_id);
-	g_signal_handler_disconnect (GTK_OBJECT (bookmark_list_widget),
+	g_signal_handler_disconnect (bookmark_list_widget,
 				     row_activated_signal_id);
 	jump_button_signal_id =
 		g_signal_connect (jump_button, "clicked",
@@ -408,9 +408,9 @@ void
 edit_bookmarks_dialog_set_signals (GObject *undo_manager_source)
 {
 
-	g_signal_handler_disconnect (GTK_OBJECT (jump_button), 
+	g_signal_handler_disconnect (jump_button,
 				     jump_button_signal_id);
-	g_signal_handler_disconnect (GTK_OBJECT (bookmark_list_widget),
+	g_signal_handler_disconnect (bookmark_list_widget,
 				     row_activated_signal_id);
 
 	jump_button_signal_id =
diff --git a/src/nautilus-location-bar.c b/src/nautilus-location-bar.c
index 647801860..ce32b1ae4 100644
--- a/src/nautilus-location-bar.c
+++ b/src/nautilus-location-bar.c
@@ -343,7 +343,7 @@ finalize (GObject *object)
 }
 
 static void
-destroy (GtkObject *object)
+destroy (GtkWidget *object)
 {
 	NautilusLocationBar *bar;
 
@@ -358,21 +358,21 @@ destroy (GtkObject *object)
 	g_free (bar->details->last_location);
 	bar->details->last_location = NULL;
 	
-	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, destroy, (object));
 }
 
 static void
 nautilus_location_bar_class_init (NautilusLocationBarClass *class)
 {
 	GObjectClass *gobject_class;
-	GtkObjectClass *object_class;
+	GtkWidgetClass *widget_class;
 	NautilusNavigationBarClass *navigation_bar_class;
 
 	gobject_class = G_OBJECT_CLASS (class);
 	gobject_class->finalize = finalize;
-	
-	object_class = GTK_OBJECT_CLASS (class);
-	object_class->destroy = destroy;
+
+	widget_class = GTK_WIDGET_CLASS (class);
+	widget_class->destroy = destroy;
 	
 	navigation_bar_class = NAUTILUS_NAVIGATION_BAR_CLASS (class);
 
diff --git a/src/nautilus-location-dialog.c b/src/nautilus-location-dialog.c
index 9cd758d05..044212ff5 100644
--- a/src/nautilus-location-dialog.c
+++ b/src/nautilus-location-dialog.c
@@ -60,16 +60,6 @@ nautilus_location_dialog_finalize (GObject *object)
 }
 
 static void
-nautilus_location_dialog_destroy (GtkObject *object)
-{
-	NautilusLocationDialog *dialog;
-
-	dialog = NAUTILUS_LOCATION_DIALOG (object);
-	
-	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-static void
 open_current_location (NautilusLocationDialog *dialog)
 {
 	GFile *location;
@@ -132,13 +122,9 @@ static void
 nautilus_location_dialog_class_init (NautilusLocationDialogClass *class)
 {
 	GObjectClass *gobject_class;
-	GtkObjectClass *object_class;
 
 	gobject_class = G_OBJECT_CLASS (class);
-	gobject_class->finalize = nautilus_location_dialog_finalize;
-	
-	object_class = GTK_OBJECT_CLASS (class);
-	object_class->destroy = nautilus_location_dialog_destroy;
+	gobject_class->finalize = nautilus_location_dialog_finalize;	
 }
 
 static void
diff --git a/src/nautilus-location-entry.c b/src/nautilus-location-entry.c
index 827a8906b..a9fc64151 100644
--- a/src/nautilus-location-entry.c
+++ b/src/nautilus-location-entry.c
@@ -261,7 +261,7 @@ finalize (GObject *object)
 }
 
 static void
-destroy (GtkObject *object)
+destroy (GtkWidget *object)
 {
 	NautilusLocationEntry *entry;
 
@@ -276,7 +276,7 @@ destroy (GtkObject *object)
 	g_free (entry->details->current_directory);
 	entry->details->current_directory = NULL;
 	
-	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, destroy, (object));
 }
 
 static void
@@ -354,17 +354,14 @@ nautilus_location_entry_class_init (NautilusLocationEntryClass *class)
 {
 	GtkWidgetClass *widget_class;
 	GObjectClass *gobject_class;
-	GtkObjectClass *object_class;
 	GtkEntryClass *entry_class;
 
 	widget_class = GTK_WIDGET_CLASS (class);
 	widget_class->focus_in_event = nautilus_location_entry_focus_in;
+	widget_class->destroy = destroy;
 
 	gobject_class = G_OBJECT_CLASS (class);
 	gobject_class->finalize = finalize;
-	
-	object_class = GTK_OBJECT_CLASS (class);
-	object_class->destroy = destroy;
 
 	entry_class = GTK_ENTRY_CLASS (class);
 	entry_class->activate = nautilus_location_entry_activate;
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index 315165332..321291895 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -106,7 +106,7 @@ eel_gtk_main_quit_all (void)
 }
 
 static void
-event_loop_unregister (GtkObject *object)
+event_loop_unregister (GtkWidget *object)
 {
 	event_loop_registrants = g_slist_remove (event_loop_registrants, object);
 	if (!is_event_loop_needed ()) {
@@ -115,14 +115,14 @@ event_loop_unregister (GtkObject *object)
 }
 
 void
-nautilus_main_event_loop_register (GtkObject *object)
+nautilus_main_event_loop_register (GtkWidget *object)
 {
 	g_signal_connect (object, "destroy", G_CALLBACK (event_loop_unregister), NULL);
 	event_loop_registrants = g_slist_prepend (event_loop_registrants, object);
 }
 
 gboolean
-nautilus_main_is_event_loop_mainstay (GtkObject *object)
+nautilus_main_is_event_loop_mainstay (GtkWidget *object)
 {
 	return g_slist_length (event_loop_registrants) == 1
 		&& event_loop_registrants->data == object;
@@ -151,7 +151,7 @@ nautilus_main_event_loop_quit (gboolean explicit)
 		   that now since gnome-session doesn't restart apps except on startup. */
 	}
 	while (event_loop_registrants != NULL) {
-		gtk_object_destroy (event_loop_registrants->data);
+		gtk_widget_destroy (event_loop_registrants->data);
 	}
 }
 
diff --git a/src/nautilus-main.h b/src/nautilus-main.h
index 44efed360..1ddb93036 100644
--- a/src/nautilus-main.h
+++ b/src/nautilus-main.h
@@ -29,8 +29,8 @@
 
 #include <gtk/gtk.h>
 
-void     nautilus_main_event_loop_register    (GtkObject *object);
-gboolean nautilus_main_is_event_loop_mainstay (GtkObject *object);
+void     nautilus_main_event_loop_register    (GtkWidget *object);
+gboolean nautilus_main_is_event_loop_mainstay (GtkWidget *object);
 void     nautilus_main_event_loop_quit        (gboolean explicit);
 
 #endif /* NAUTILUS_MAIN_H */
diff --git a/src/nautilus-navigation-bar.c b/src/nautilus-navigation-bar.c
index 26da78c27..5340f86c5 100644
--- a/src/nautilus-navigation-bar.c
+++ b/src/nautilus-navigation-bar.c
@@ -53,14 +53,11 @@ EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_navigation_bar, set_location)
 static void
 nautilus_navigation_bar_class_init (NautilusNavigationBarClass *klass)
 {
-	GtkObjectClass *object_class;
 	GtkBindingSet *binding_set;
 
-	object_class = GTK_OBJECT_CLASS (klass);
-	
 	signals[ACTIVATE] = g_signal_new
 		("activate",
-		 G_TYPE_FROM_CLASS (object_class),
+		 G_TYPE_FROM_CLASS (klass),
 		 G_SIGNAL_RUN_LAST,
 		 G_STRUCT_OFFSET (NautilusNavigationBarClass,
 				    activate),
@@ -70,7 +67,7 @@ nautilus_navigation_bar_class_init (NautilusNavigationBarClass *klass)
 
 	signals[CANCEL] = g_signal_new
 		("cancel",
-		 G_TYPE_FROM_CLASS (object_class),
+		 G_TYPE_FROM_CLASS (klass),
 		 G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
 		 G_STRUCT_OFFSET (NautilusNavigationBarClass,
 				    cancel),
@@ -80,7 +77,7 @@ nautilus_navigation_bar_class_init (NautilusNavigationBarClass *klass)
 
 	signals[LOCATION_CHANGED] = g_signal_new
 		("location_changed",
-		 G_TYPE_FROM_CLASS (object_class),
+		 G_TYPE_FROM_CLASS (klass),
 		 G_SIGNAL_RUN_LAST,
 		 G_STRUCT_OFFSET (NautilusNavigationBarClass,
 				    location_changed),
diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index 3b9fafc80..6f3fa0ebe 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -113,7 +113,7 @@ forget_history_if_yes (GtkDialog *dialog, int response, gpointer callback_data)
 	if (response == RESPONSE_FORGET) {
 		nautilus_forget_history ();
 	}
-	gtk_object_destroy (GTK_OBJECT (dialog));
+	gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
 static void
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index 7563f55a1..6aadb8a59 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -563,7 +563,7 @@ nautilus_navigation_window_button_press_event (GtkWidget *widget,
 }
 
 static void
-nautilus_navigation_window_destroy (GtkObject *object)
+nautilus_navigation_window_destroy (GtkWidget *object)
 {
 	NautilusNavigationWindow *window;
 	
@@ -579,7 +579,7 @@ nautilus_navigation_window_destroy (GtkObject *object)
 	window->details->content_paned = NULL;
 	window->details->split_view_hpane = NULL;
 
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
+	GTK_WIDGET_CLASS (parent_class)->destroy (object);
 }
 
 static void
@@ -1170,7 +1170,7 @@ nautilus_navigation_window_class_init (NautilusNavigationWindowClass *class)
 	NAUTILUS_WINDOW_CLASS (class)->bookmarks_placeholder = MENU_PATH_BOOKMARKS_PLACEHOLDER;
 	
 	G_OBJECT_CLASS (class)->finalize = nautilus_navigation_window_finalize;
-	GTK_OBJECT_CLASS (class)->destroy = nautilus_navigation_window_destroy;
+	GTK_WIDGET_CLASS (class)->destroy = nautilus_navigation_window_destroy;
 	GTK_WIDGET_CLASS (class)->show = nautilus_navigation_window_show;
 	GTK_WIDGET_CLASS (class)->unrealize = nautilus_navigation_window_unrealize;
 	GTK_WIDGET_CLASS (class)->window_state_event = nautilus_navigation_window_state_event;
diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c
index e4eb76e2d..8ef14c8d8 100644
--- a/src/nautilus-pathbar.c
+++ b/src/nautilus-pathbar.c
@@ -348,12 +348,10 @@ static void
 nautilus_path_bar_class_init (NautilusPathBarClass *path_bar_class)
 {
         GObjectClass *gobject_class;
-        GtkObjectClass *object_class;
         GtkWidgetClass *widget_class;
         GtkContainerClass *container_class;
 
         gobject_class = (GObjectClass *) path_bar_class;
-        object_class = (GtkObjectClass *) path_bar_class;
         widget_class = (GtkWidgetClass *) path_bar_class;
         container_class = (GtkContainerClass *) path_bar_class;
 
@@ -375,7 +373,7 @@ nautilus_path_bar_class_init (NautilusPathBarClass *path_bar_class)
 
         path_bar_signals [PATH_CLICKED] =
                 g_signal_new ("path-clicked",
-		  G_OBJECT_CLASS_TYPE (object_class),
+		  G_OBJECT_CLASS_TYPE (path_bar_class),
 		  G_SIGNAL_RUN_FIRST,
 		  G_STRUCT_OFFSET (NautilusPathBarClass, path_clicked),
 		  NULL, NULL,
@@ -384,7 +382,7 @@ nautilus_path_bar_class_init (NautilusPathBarClass *path_bar_class)
 		  G_TYPE_FILE);
 	 path_bar_signals [PATH_SET] =
 		g_signal_new ("path-set",
-		  G_OBJECT_CLASS_TYPE (object_class),
+		  G_OBJECT_CLASS_TYPE (path_bar_class),
 		  G_SIGNAL_RUN_FIRST,
 		  G_STRUCT_OFFSET (NautilusPathBarClass, path_set),
 		  NULL, NULL,
diff --git a/src/nautilus-window-bookmarks.c b/src/nautilus-window-bookmarks.c
index 84d0fa0f4..f6cae7740 100644
--- a/src/nautilus-window-bookmarks.c
+++ b/src/nautilus-window-bookmarks.c
@@ -62,7 +62,7 @@ remove_bookmarks_for_uri_if_yes (GtkDialog *dialog, int response, gpointer callb
 		nautilus_bookmark_list_delete_items_with_uri (window->details->bookmark_list, uri);
 	}
 
-	gtk_object_destroy (GTK_OBJECT (dialog));
+	gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
 static void
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index bbaea0089..99a9c055e 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -1201,11 +1201,11 @@ got_file_info_for_view_selection_callback (NautilusFile *file,
 						g_object_unref (root);
 					}
 				} else {
-					gtk_object_destroy (GTK_OBJECT (window));
+					gtk_widget_destroy (GTK_WIDGET (window));
 				}
 			} else {
 				/* Since this is a window, destroying it will also unref it. */
-				gtk_object_destroy (GTK_OBJECT (window));
+				gtk_widget_destroy (GTK_WIDGET (window));
 			}
 		} else {
 			/* Clean up state of already-showing window */
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index eb1b6b51a..e305bcb95 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -187,10 +187,10 @@ nautilus_window_init (NautilusWindow *window)
 	g_signal_connect_object (nautilus_signaller_get_current (), "popup_menu_changed",
 			 G_CALLBACK (nautilus_window_load_extension_menus), window, G_CONNECT_SWAPPED);
 
-	gtk_quit_add_destroy (1, GTK_OBJECT (window));
+	gtk_quit_add_destroy (1, GTK_WIDGET (window));
 
 	/* Keep the main event loop alive as long as the window exists */
-	nautilus_main_event_loop_register (GTK_OBJECT (window));
+	nautilus_main_event_loop_register (GTK_WIDGET (window));
 }
 
 /* Unconditionally synchronize the GtkUIManager of WINDOW. */
@@ -608,7 +608,7 @@ free_stored_viewers (NautilusWindow *window)
 }
 
 static void
-nautilus_window_destroy (GtkObject *object)
+nautilus_window_destroy (GtkWidget *object)
 {
 	NautilusWindow *window;
 	GList *panes_copy;
@@ -624,7 +624,7 @@ nautilus_window_destroy (GtkObject *object)
 	g_assert (window->details->panes == NULL);
 	g_assert (window->details->active_pane == NULL);
 
-	GTK_OBJECT_CLASS (nautilus_window_parent_class)->destroy (object);
+	GTK_WIDGET_CLASS (nautilus_window_parent_class)->destroy (object);
 }
 
 static void
@@ -1997,7 +1997,7 @@ nautilus_window_class_init (NautilusWindowClass *class)
 	G_OBJECT_CLASS (class)->constructed = nautilus_window_constructed;
 	G_OBJECT_CLASS (class)->get_property = nautilus_window_get_property;
 	G_OBJECT_CLASS (class)->set_property = nautilus_window_set_property;
-	GTK_OBJECT_CLASS (class)->destroy = nautilus_window_destroy;
+	GTK_WIDGET_CLASS (class)->destroy = nautilus_window_destroy;
 	GTK_WIDGET_CLASS (class)->show = nautilus_window_show;
 	GTK_WIDGET_CLASS (class)->size_request = nautilus_window_size_request;
 	GTK_WIDGET_CLASS (class)->realize = nautilus_window_realize;