diff --git a/cpufreq/src/cpufreq-applet.c b/cpufreq/src/cpufreq-applet.c
index d1754fe..89abf39 100644
--- a/cpufreq/src/cpufreq-applet.c
+++ b/cpufreq/src/cpufreq-applet.c
@@ -94,7 +94,7 @@ static void     cpufreq_applet_update            (CPUFreqApplet      *applet,
                                                   CPUFreqMonitor     *monitor);
 static void     cpufreq_applet_refresh           (CPUFreqApplet      *applet);
 
-static void     cpufreq_applet_destroy           (GtkObject          *widget);
+static void     cpufreq_applet_destroy           (GtkWidget          *widget);
 static gboolean cpufreq_applet_button_press      (GtkWidget          *widget,
                                                   GdkEventButton     *event);
 static gboolean cpufreq_applet_key_press         (GtkWidget          *widget,
@@ -213,10 +213,9 @@ static void
 cpufreq_applet_class_init (CPUFreqAppletClass *klass)
 {
         PanelAppletClass *applet_class = PANEL_APPLET_CLASS (klass);
-        GtkObjectClass   *gtkobject_class = GTK_OBJECT_CLASS (klass);
         GtkWidgetClass   *widget_class = GTK_WIDGET_CLASS (klass);
 
-        gtkobject_class->destroy = cpufreq_applet_destroy;
+        widget_class->destroy = cpufreq_applet_destroy;
            
         widget_class->size_allocate = cpufreq_applet_size_allocate;
 	widget_class->size_request = cpufreq_applet_size_request;
@@ -227,7 +226,7 @@ cpufreq_applet_class_init (CPUFreqAppletClass *klass)
 }
 
 static void
-cpufreq_applet_destroy (GtkObject *widget)
+cpufreq_applet_destroy (GtkWidget *widget)
 {
         CPUFreqApplet *applet;
         gint           i;
@@ -256,7 +255,7 @@ cpufreq_applet_destroy (GtkObject *widget)
                 applet->popup = NULL;
         }
 
-        GTK_OBJECT_CLASS (cpufreq_applet_parent_class)->destroy (widget);
+        GTK_WIDGET_CLASS (cpufreq_applet_parent_class)->destroy (widget);
 }
 
 static void
diff --git a/drivemount/drive-button.c b/drivemount/drive-button.c
index cb1a8b9..07e8082 100644
--- a/drivemount/drive-button.c
+++ b/drivemount/drive-button.c
@@ -52,7 +52,7 @@ static void     drive_button_set_mount    (DriveButton    *self,
 static void     drive_button_reset_popup  (DriveButton    *self);
 static void     drive_button_ensure_popup (DriveButton    *self);
 
-static void     drive_button_destroy      (GtkObject      *object);
+static void     drive_button_destroy      (GObject      *object);
 #if 0
 static void     drive_button_unrealize    (GtkWidget      *widget);
 #endif /* 0 */
@@ -66,7 +66,7 @@ static void drive_button_theme_change     (GtkIconTheme   *icon_theme,
 static void
 drive_button_class_init (DriveButtonClass *class)
 {
-    GTK_OBJECT_CLASS(class)->destroy = drive_button_destroy;
+    GTK_WIDGET_CLASS(class)->destroy = drive_button_destroy;
     GTK_WIDGET_CLASS(class)->button_press_event = drive_button_button_press;
     GTK_WIDGET_CLASS(class)->key_press_event = drive_button_key_press;
 
@@ -133,7 +133,7 @@ drive_button_new_from_mount (GMount *mount)
 }
 
 static void
-drive_button_destroy (GtkObject *object)
+drive_button_destroy (GtkWidget *object)
 {
     DriveButton *self = DRIVE_BUTTON (object);
 
@@ -145,8 +145,8 @@ drive_button_destroy (GtkObject *object)
 
     drive_button_reset_popup (self);
 
-    if (GTK_OBJECT_CLASS (drive_button_parent_class)->destroy)
-	(* GTK_OBJECT_CLASS (drive_button_parent_class)->destroy) (object);
+    if (GTK_WIDGET_CLASS (drive_button_parent_class)->destroy)
+	(* GTK_WIDGET_CLASS (drive_button_parent_class)->destroy) (object);
 }
 
 #if 0
@@ -458,7 +458,7 @@ static void
 drive_button_reset_popup (DriveButton *self)
 {
     if (self->popup_menu)
-	gtk_object_destroy (GTK_OBJECT (self->popup_menu));
+	gtk_widget_destroy (GTK_WIDGET (self->popup_menu));
     self->popup_menu = NULL;
 }
 
@@ -557,7 +557,7 @@ open_drive (DriveButton *self, GtkWidget *item)
 						     argv[0]);
 	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), error->message, NULL);
 	g_signal_connect (dialog, "response",
-			  G_CALLBACK (gtk_object_destroy), NULL);
+			  G_CALLBACK (gtk_widget_destroy), NULL);
 	gtk_widget_show (dialog);
 	g_error_free (error);
     }
diff --git a/drivemount/drive-list.c b/drivemount/drive-list.c
index 1013a88..83b0257 100644
--- a/drivemount/drive-list.c
+++ b/drivemount/drive-list.c
@@ -35,7 +35,7 @@ G_DEFINE_TYPE (DriveList, drive_list, GTK_TYPE_TABLE);
 static GVolumeMonitor *volume_monitor = NULL;
 
 static void drive_list_finalize (GObject *object);
-static void drive_list_destroy  (GtkObject *object);
+static void drive_list_destroy  (GtkWidget *object);
 static void drive_list_add      (GtkContainer *container, GtkWidget *child);
 static void drive_list_remove   (GtkContainer *container, GtkWidget *child);
 
@@ -144,7 +144,7 @@ drive_list_finalize (GObject *object)
 }
 
 static void
-drive_list_destroy (GtkObject *object)
+drive_list_destroy (GtkWidget *object)
 {
     DriveList *self = DRIVE_LIST (object);
 
@@ -165,8 +165,8 @@ drive_list_destroy (GtkObject *object)
 	g_source_remove (self->layout_tag);
     self->layout_tag = 0;
 
-    if (GTK_OBJECT_CLASS (drive_list_parent_class)->destroy)
-	(* GTK_OBJECT_CLASS (drive_list_parent_class)->destroy) (object);
+    if (GTK_WIDGET_CLASS (drive_list_parent_class)->destroy)
+	(* GTK_WIDGET_CLASS (drive_list_parent_class)->destroy) (object);
 }
 
 static void
diff --git a/geyes/geyes.c b/geyes/geyes.c
index e5d65bd..ec8c92b 100644
--- a/geyes/geyes.c
+++ b/geyes/geyes.c
@@ -297,7 +297,7 @@ create_eyes (PanelApplet *applet)
 }
 
 static void
-destroy_cb (GtkObject *object, EyesApplet *eyes_applet)
+destroy_cb (GtkWidget *object, EyesApplet *eyes_applet)
 {
 	g_return_if_fail (eyes_applet);
 
diff --git a/gweather/gweather-pref.c b/gweather/gweather-pref.c
index 9366e3a..b236ce8 100644
--- a/gweather/gweather-pref.c
+++ b/gweather/gweather-pref.c
@@ -778,7 +778,7 @@ gweather_pref_create (GWeatherPref *pref)
     GtkWidget *pref_basic_update_alignment;
     GtkWidget *pref_basic_update_lbl;
     GtkWidget *pref_basic_update_hbox;
-    GtkObject *pref_basic_update_spin_adj;
+    GObject   *pref_basic_update_spin_adj;
     GtkWidget *pref_basic_update_sec_lbl;
     GtkWidget *pref_basic_note_lbl;
     GtkWidget *pref_loc_hbox;
diff --git a/mixer/applet.c b/mixer/applet.c
index fefbb02..8d53dfc 100644
--- a/mixer/applet.c
+++ b/mixer/applet.c
@@ -379,7 +379,6 @@ gboolean
 gnome_volume_applet_setup (GnomeVolumeApplet *applet,
 			   GList *elements)
 {
-  GtkObject *adj;
   static const GtkActionEntry actions[] = {
     { "RunMixer", NULL, N_("_Open Volume Control"),
       NULL, NULL,
diff --git a/trashapplet/src/trash-empty.c b/trashapplet/src/trash-empty.c
index 858fe77..722462b 100644
--- a/trashapplet/src/trash-empty.c
+++ b/trashapplet/src/trash-empty.c
@@ -126,7 +126,7 @@ trash_empty_update_dialog (gpointer user_data)
 static gboolean
 trash_empty_done (gpointer user_data)
 {
-  gtk_object_destroy (GTK_OBJECT (trash_empty_dialog));
+  gtk_widget_destroy (GTK_WIDGET (trash_empty_dialog));
 
   g_assert (trash_empty_dialog == NULL);
 
@@ -261,7 +261,7 @@ trash_empty_start (GtkWidget *parent)
           g_critical ("failed to parse trash-empty dialog markup");
 
           if (trash_empty_dialog)
-            gtk_object_destroy (GTK_OBJECT (trash_empty_dialog));
+            gtk_widget_destroy (GTK_WIDGET (trash_empty_dialog));
 
           g_object_unref (builder);
           return;
@@ -300,7 +300,7 @@ trash_empty_confirmation_response (GtkDialog *dialog,
   if (response_id == GTK_RESPONSE_YES)
     trash_empty_start (GTK_WIDGET (dialog));
 
-  gtk_object_destroy (GTK_OBJECT (dialog));
+  gtk_widget_destroy (GTK_WIDGET (dialog));
   g_assert (trash_empty_confirm_dialog == NULL);
 }
 
diff --git a/trashapplet/src/trashapplet.c b/trashapplet/src/trashapplet.c
index ed38423..d5d17d2 100644
--- a/trashapplet/src/trashapplet.c
+++ b/trashapplet/src/trashapplet.c
@@ -185,7 +185,7 @@ trash_applet_size_allocate (GtkWidget    *widget,
 }
 
 static void
-trash_applet_destroy (GtkObject *object)
+trash_applet_destroy (GtkWidget *object)
 {
   TrashApplet *applet = TRASH_APPLET (object);
 
@@ -205,7 +205,7 @@ trash_applet_destroy (GtkObject *object)
     g_object_unref (applet->icon);
   applet->icon = NULL;
 
-  GTK_OBJECT_CLASS (trash_applet_parent_class)
+  GTK_WIDGET_CLASS (trash_applet_parent_class)
     ->destroy (object);
 }
 
@@ -516,7 +516,7 @@ confirm_delete_immediately (GtkWidget *parent_view,
 
   response = gtk_dialog_run (GTK_DIALOG (dialog));
 
-  gtk_object_destroy (GTK_OBJECT (dialog));
+  gtk_widget_destroy (GTK_WIDGET (dialog));
 
   return response == GTK_RESPONSE_YES;
 }
@@ -591,10 +591,9 @@ trash_applet_drag_data_received (GtkWidget        *widget,
 static void
 trash_applet_class_init (TrashAppletClass *class)
 {
-  GtkObjectClass *gtkobject_class = GTK_OBJECT_CLASS (class);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
 
-  gtkobject_class->destroy = trash_applet_destroy;
+  widget_class->destroy = trash_applet_destroy;
   widget_class->size_allocate = trash_applet_size_allocate;
   widget_class->button_release_event = trash_applet_button_release;
   widget_class->key_press_event = trash_applet_key_press;
