diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ev-page-action.c | 8 | ||||
| -rw-r--r-- | shell/ev-sidebar-thumbnails.c | 6 |
2 files changed, 3 insertions, 11 deletions
diff --git a/shell/ev-page-action.c b/shell/ev-page-action.c index 29bae4e..9e32707 100644 --- a/shell/ev-page-action.c +++ b/shell/ev-page-action.c @@ -54,8 +54,6 @@ enum static guint signals[LAST_SIGNAL] = { 0 }; -static GObjectClass *parent_class = NULL; - G_DEFINE_TYPE (EvPageAction, ev_page_action, GTK_TYPE_ACTION) #define EV_PAGE_ACTION_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_PAGE_ACTION, EvPageActionPrivate)) @@ -158,7 +156,7 @@ connect_proxy (GtkAction *action, GtkWidget *proxy) proxy, 0); } - GTK_ACTION_CLASS (parent_class)->connect_proxy (action, proxy); + GTK_ACTION_CLASS (ev_page_action_parent_class)->connect_proxy (action, proxy); } static void @@ -170,7 +168,7 @@ ev_page_action_init (EvPageAction *action) static void ev_page_action_finalize (GObject *object) { - parent_class->finalize (object); + G_OBJECT_CLASS (ev_page_action_parent_class)->finalize (object); } static void @@ -233,8 +231,6 @@ ev_page_action_class_init (EvPageActionClass *class) object_class->set_property = ev_page_action_set_property; object_class->get_property = ev_page_action_get_property; - parent_class = g_type_class_peek_parent (class); - action_class->toolbar_item_type = GTK_TYPE_TOOL_ITEM; action_class->create_tool_item = create_tool_item; action_class->connect_proxy = connect_proxy; diff --git a/shell/ev-sidebar-thumbnails.c b/shell/ev-sidebar-thumbnails.c index 3d13b5e..4d54d11 100644 --- a/shell/ev-sidebar-thumbnails.c +++ b/shell/ev-sidebar-thumbnails.c @@ -57,8 +57,6 @@ enum { NUM_COLUMNS }; -static GtkVBoxClass *parent_class; - G_DEFINE_TYPE (EvSidebarThumbnails, ev_sidebar_thumbnails, GTK_TYPE_VBOX); #define EV_SIDEBAR_THUMBNAILS_GET_PRIVATE(object) \ @@ -76,7 +74,7 @@ ev_sidebar_thumbnails_destroy (GtkObject *object) priv->idle_id = 0; } - GTK_OBJECT_CLASS (parent_class)->destroy (object); + GTK_OBJECT_CLASS (ev_sidebar_thumbnails_parent_class)->destroy (object); } static void @@ -88,8 +86,6 @@ ev_sidebar_thumbnails_class_init (EvSidebarThumbnailsClass *ev_sidebar_thumbnail g_object_class = G_OBJECT_CLASS (ev_sidebar_thumbnails_class); gtk_object_class = GTK_OBJECT_CLASS (ev_sidebar_thumbnails_class); - parent_class = g_type_class_peek_parent (ev_sidebar_thumbnails_class); - gtk_object_class->destroy = ev_sidebar_thumbnails_destroy; g_type_class_add_private (g_object_class, sizeof (EvSidebarThumbnailsPrivate)); |