X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-sidebar.c;h=3a99b556a5079da7596d1d25e8e19045b869fa0d;hb=d68a55580d2e63c0587b11580dfde219d5ef56fb;hp=cf5f2a306c348819f4612cd58b34f8c845edcfb3;hpb=563188c05ea9400b796f3f4cc02c508eda2c2860;p=evince.git diff --git a/shell/ev-sidebar.c b/shell/ev-sidebar.c index cf5f2a30..3a99b556 100644 --- a/shell/ev-sidebar.c +++ b/shell/ev-sidebar.c @@ -64,7 +64,7 @@ G_DEFINE_TYPE (EvSidebar, ev_sidebar, GTK_TYPE_VBOX) (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_SIDEBAR, EvSidebarPrivate)) static void -ev_sidebar_destroy (GtkObject *object) +ev_sidebar_dispose (GObject *object) { EvSidebar *ev_sidebar = EV_SIDEBAR (object); @@ -79,7 +79,7 @@ ev_sidebar_destroy (GtkObject *object) } - (* GTK_OBJECT_CLASS (ev_sidebar_parent_class)->destroy) (object); + G_OBJECT_CLASS (ev_sidebar_parent_class)->dispose (object); } static void @@ -175,17 +175,11 @@ ev_sidebar_get_property (GObject *object, static void ev_sidebar_class_init (EvSidebarClass *ev_sidebar_class) { - GObjectClass *g_object_class; - GtkWidgetClass *widget_class; - GtkObjectClass *gtk_object_klass; - - g_object_class = G_OBJECT_CLASS (ev_sidebar_class); - widget_class = GTK_WIDGET_CLASS (ev_sidebar_class); - gtk_object_klass = GTK_OBJECT_CLASS (ev_sidebar_class); - + GObjectClass *g_object_class = G_OBJECT_CLASS (ev_sidebar_class); + g_type_class_add_private (g_object_class, sizeof (EvSidebarPrivate)); - - gtk_object_klass->destroy = ev_sidebar_destroy; + + g_object_class->dispose = ev_sidebar_dispose; g_object_class->get_property = ev_sidebar_get_property; g_object_class->set_property = ev_sidebar_set_property;