From e4540e7be4b396c8b1bb34157c105e172ccdf0a1 Mon Sep 17 00:00:00 2001 From: Stefano Karapetsas Date: Tue, 21 Jan 2014 17:11:27 +0100 Subject: shell: Add GTK3 support --- shell/ev-sidebar-attachments.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'shell/ev-sidebar-attachments.c') diff --git a/shell/ev-sidebar-attachments.c b/shell/ev-sidebar-attachments.c index b26711cb..989c60d5 100644 --- a/shell/ev-sidebar-attachments.c +++ b/shell/ev-sidebar-attachments.c @@ -472,7 +472,11 @@ ev_sidebar_attachments_get_property (GObject *object, } static void +#if GTK_CHECK_VERSION (3, 0, 0) +ev_sidebar_attachments_dispose (GObject *object) +#else ev_sidebar_attachments_destroy (GtkObject *object) +#endif { EvSidebarAttachments *ev_attachbar = EV_SIDEBAR_ATTACHMENTS (object); @@ -494,22 +498,34 @@ ev_sidebar_attachments_destroy (GtkObject *object) ev_attachbar->priv->icon_cache = NULL; } +#if GTK_CHECK_VERSION (3, 0, 0) + (* G_OBJECT_CLASS (ev_sidebar_attachments_parent_class)->dispose) (object); +#else (* GTK_OBJECT_CLASS (ev_sidebar_attachments_parent_class)->destroy) (object); +#endif } static void ev_sidebar_attachments_class_init (EvSidebarAttachmentsClass *ev_attachbar_class) { GObjectClass *g_object_class; +#if !GTK_CHECK_VERSION (3, 0, 0) GtkObjectClass *gtk_object_class; +#endif GtkWidgetClass *gtk_widget_class; g_object_class = G_OBJECT_CLASS (ev_attachbar_class); +#if !GTK_CHECK_VERSION (3, 0, 0) gtk_object_class = GTK_OBJECT_CLASS (ev_attachbar_class); +#endif gtk_widget_class = GTK_WIDGET_CLASS (ev_attachbar_class); g_object_class->get_property = ev_sidebar_attachments_get_property; +#if GTK_CHECK_VERSION (3, 0, 0) + g_object_class->dispose = ev_sidebar_attachments_dispose; +#else gtk_object_class->destroy = ev_sidebar_attachments_destroy; +#endif gtk_widget_class->popup_menu = ev_sidebar_attachments_popup_menu; gtk_widget_class->screen_changed = ev_sidebar_attachments_screen_changed; -- cgit v1.2.1