Do not call g_type_class_peek_parent twice.

2006-11-22  Carlos Garcia Campos  <carlosgc@gnome.org>
	* shell/ev-history.c: (ev_history_finalize), (ev_history_class_init):
	* shell/ev-navigation-action.c: (connect_proxy),
	(ev_navigation_action_finalize), (ev_navigation_action_class_init):
	Do not call g_type_class_peek_parent twice.

diff --git a/ChangeLog b/ChangeLog
index 0e02b50c788498f78063c92e1374d48bfbb02a47..40a70066757f654f77ab634df360d831844e7a64 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-11-22  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+       * shell/ev-history.c: (ev_history_finalize), (ev_history_class_init):
+       * shell/ev-navigation-action.c: (connect_proxy),
+       (ev_navigation_action_finalize), (ev_navigation_action_class_init):
+       
+       Do not call g_type_class_peek_parent twice.
+
 2006-11-22  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
 
        * configure.ac:

diff --git a/shell/ev-history.c b/shell/ev-history.c
index c316c841ce0af0fe235c61c451e081ae8165df67..d4aa8225a6320b8ab709a4edb31904f2b74455f5 100644 (file)
--- a/shell/ev-history.c
+++ b/shell/ev-history.c
@@ -37,8 +37,6 @@ enum {
 static void ev_history_init       (EvHistory *history);
 static void ev_history_class_init (EvHistoryClass *class);
 
-static GObjectClass *parent_class = NULL;
-
 G_DEFINE_TYPE (EvHistory, ev_history, G_TYPE_OBJECT)
 
 #define EV_HISTORY_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_HISTORY, EvHistoryPrivate))
@@ -66,7 +64,7 @@ ev_history_finalize (GObject *object)
 
        free_links_list (history->priv->links);
 
-       parent_class->finalize (object);
+       G_OBJECT_CLASS (ev_history_parent_class)->finalize (object);
 }
 
 static void
@@ -118,8 +116,6 @@ ev_history_class_init (EvHistoryClass *class)
        object_class->set_property = ev_history_set_property;
        object_class->get_property = ev_history_get_property;
 
-       parent_class = g_type_class_peek_parent (class);
-
        g_object_class_install_property (object_class,
                                         PROP_INDEX,
                                         g_param_spec_int ("index",

diff --git a/shell/ev-navigation-action.c b/shell/ev-navigation-action.c
index 4eeda9a2057e26054a1f39671b93e572f334c7b6..bedadfe90ab9370359f90f0d4a061d262ee75035 100644 (file)
--- a/shell/ev-navigation-action.c
+++ b/shell/ev-navigation-action.c
@@ -42,8 +42,6 @@ struct _EvNavigationActionPrivate
 static void ev_navigation_action_init       (EvNavigationAction *action);
 static void ev_navigation_action_class_init (EvNavigationActionClass *class);
 
-static GObjectClass *parent_class = NULL;
-
 G_DEFINE_TYPE (EvNavigationAction, ev_navigation_action, GTK_TYPE_ACTION)
 
 #define MAX_LABEL_LENGTH 48
@@ -180,7 +178,7 @@ connect_proxy (GtkAction *action, GtkWidget *proxy)
        g_signal_connect (proxy, "show-menu",
                          G_CALLBACK (menu_activated_cb), action);
 
-       GTK_ACTION_CLASS (parent_class)->connect_proxy (action, proxy);
+       GTK_ACTION_CLASS (ev_navigation_action_parent_class)->connect_proxy (action, proxy);
 }
 
 static GtkWidget *
@@ -210,7 +208,7 @@ ev_navigation_action_finalize (GObject *object)
                                           (gpointer *) &action->priv->history);
        }
 
-       parent_class->finalize (object);
+       G_OBJECT_CLASS (ev_navigation_action_parent_class)->finalize (object);
 }
 
 static void
@@ -220,7 +218,6 @@ ev_navigation_action_class_init (EvNavigationActionClass *class)
        GtkActionClass *action_class = GTK_ACTION_CLASS (class);
 
        object_class->finalize = ev_navigation_action_finalize;
-       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;