X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-sidebar-attachments.c;h=5b717896ac1a913732a58c6dcaaa8d3040ca4e81;hb=d4139205b010ed06310d14284e63114e88ec6de2;hp=0b1aa8d16ab707144731260fb13944207dd0e2d3;hpb=19a00ed1cd086dcca4b6bfeb84e0b1488b2e3089;p=evince.git

diff --git a/shell/ev-sidebar-attachments.c b/shell/ev-sidebar-attachments.c
index 0b1aa8d1..5b717896 100644
--- a/shell/ev-sidebar-attachments.c
+++ b/shell/ev-sidebar-attachments.c
@@ -67,7 +67,7 @@ struct _EvSidebarAttachmentsPrivate {
 	GHashTable     *icon_cache;
 };
 
-static void ev_sidebar_attachments_page_iface_init (EvSidebarPageIface *iface);
+static void ev_sidebar_attachments_page_iface_init (EvSidebarPageInterface *iface);
 
 G_DEFINE_TYPE_EXTENDED (EvSidebarAttachments,
                         ev_sidebar_attachments,
@@ -472,7 +472,7 @@ ev_sidebar_attachments_get_property (GObject    *object,
 }
 
 static void
-ev_sidebar_attachments_destroy (GtkObject *object)
+ev_sidebar_attachments_dispose (GObject *object)
 {
 	EvSidebarAttachments *ev_attachbar = EV_SIDEBAR_ATTACHMENTS (object);
 
@@ -494,22 +494,20 @@ ev_sidebar_attachments_destroy (GtkObject *object)
 		ev_attachbar->priv->icon_cache = NULL;
 	}
 
-	(* GTK_OBJECT_CLASS (ev_sidebar_attachments_parent_class)->destroy) (object);
+	G_OBJECT_CLASS (ev_sidebar_attachments_parent_class)->dispose (object);
 }
 
 static void
 ev_sidebar_attachments_class_init (EvSidebarAttachmentsClass *ev_attachbar_class)
 {
 	GObjectClass   *g_object_class;
-	GtkObjectClass *gtk_object_class;
 	GtkWidgetClass *gtk_widget_class;
 
 	g_object_class = G_OBJECT_CLASS (ev_attachbar_class);
-	gtk_object_class = GTK_OBJECT_CLASS (ev_attachbar_class);
 	gtk_widget_class = GTK_WIDGET_CLASS (ev_attachbar_class);
 
 	g_object_class->get_property = ev_sidebar_attachments_get_property;
-	gtk_object_class->destroy = ev_sidebar_attachments_destroy;
+	g_object_class->dispose = ev_sidebar_attachments_dispose;
 	gtk_widget_class->popup_menu = ev_sidebar_attachments_popup_menu;
 	gtk_widget_class->screen_changed = ev_sidebar_attachments_screen_changed;
 
@@ -698,7 +696,7 @@ ev_sidebar_attachments_get_label (EvSidebarPage *sidebar_page)
 }
 
 static void
-ev_sidebar_attachments_page_iface_init (EvSidebarPageIface *iface)
+ev_sidebar_attachments_page_iface_init (EvSidebarPageInterface *iface)
 {
 	iface->support_document = ev_sidebar_attachments_support_document;
 	iface->set_model = ev_sidebar_attachments_set_model;