diff --git a/src/eog-sidebar.c b/src/eog-sidebar.c
index d8b318c..e76f616 100644
--- a/src/eog-sidebar.c
+++ b/src/eog-sidebar.c
@@ -70,7 +70,7 @@ G_DEFINE_TYPE (EogSidebar, eog_sidebar, GTK_TYPE_VBOX)
 	(G_TYPE_INSTANCE_GET_PRIVATE ((object), EOG_TYPE_SIDEBAR, EogSidebarPrivate))
 
 static void
-eog_sidebar_destroy (GtkObject *object)
+eog_sidebar_destroy (GtkWidget *object)
 {
 	EogSidebar *eog_sidebar = EOG_SIDEBAR (object);
 
@@ -84,7 +84,7 @@ eog_sidebar_destroy (GtkObject *object)
 		eog_sidebar->priv->page_model = NULL;
 	}
 
-	(* GTK_OBJECT_CLASS (eog_sidebar_parent_class)->destroy) (object);
+	(* GTK_WIDGET_CLASS (eog_sidebar_parent_class)->destroy) (object);
 }
 
 static void
@@ -181,15 +181,13 @@ eog_sidebar_class_init (EogSidebarClass *eog_sidebar_class)
 {
 	GObjectClass *g_object_class;
 	GtkWidgetClass *widget_class;
-	GtkObjectClass *gtk_object_klass;
 
 	g_object_class = G_OBJECT_CLASS (eog_sidebar_class);
 	widget_class = GTK_WIDGET_CLASS (eog_sidebar_class);
-	gtk_object_klass = GTK_OBJECT_CLASS (eog_sidebar_class);
 
 	g_type_class_add_private (g_object_class, sizeof (EogSidebarPrivate));
 
-	gtk_object_klass->destroy = eog_sidebar_destroy;
+	widget_class->destroy = eog_sidebar_destroy;
 	g_object_class->get_property = eog_sidebar_get_property;
 	g_object_class->set_property = eog_sidebar_set_property;
 
diff --git a/src/eog-thumb-view.c b/src/eog-thumb-view.c
index 052ca9e..f49459c 100644
--- a/src/eog-thumb-view.c
+++ b/src/eog-thumb-view.c
@@ -71,23 +71,23 @@ eog_thumb_view_finalize (GObject *object)
 }
 
 static void
-eog_thumb_view_destroy (GtkObject *object)
+eog_thumb_view_destroy (GtkWidget *object)
 {
 	EogThumbView *thumbview;
 	g_return_if_fail (EOG_IS_THUMB_VIEW (object));
 	thumbview = EOG_THUMB_VIEW (object);
 
-	GTK_OBJECT_CLASS (eog_thumb_view_parent_class)->destroy (object);
+	GTK_WIDGET_CLASS (eog_thumb_view_parent_class)->destroy (object);
 }
 
 static void
 eog_thumb_view_class_init (EogThumbViewClass *class)
 {
 	GObjectClass *gobject_class = G_OBJECT_CLASS (class);
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (class);
+	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
 
 	gobject_class->finalize = eog_thumb_view_finalize;
-	object_class->destroy = eog_thumb_view_destroy;
+	widget_class->destroy = eog_thumb_view_destroy;
 
 	g_type_class_add_private (class, sizeof (EogThumbViewPrivate));
 }
@@ -225,7 +225,7 @@ thumbview_on_adjustment_changed_cb (EogThumbView *thumbview,
 
 static void
 thumbview_on_parent_set_cb (GtkWidget *widget,
-			    GtkObject *old_parent,
+			    GtkWidget *old_parent,
 			    gpointer   user_data)
 {
 	EogThumbView *thumbview = EOG_THUMB_VIEW (widget);
