From c003c99a75587ba39a45d164272760c33f9666b5 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 25 Feb 2011 16:20:41 +0100 Subject: Bug #614480 - Avoid using G_TYPE_INSTANCE_GET_PRIVATE repeatedly --- widgets/misc/e-action-combo-box.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'widgets/misc/e-action-combo-box.c') diff --git a/widgets/misc/e-action-combo-box.c b/widgets/misc/e-action-combo-box.c index ee88b7d199..5c9c44267b 100644 --- a/widgets/misc/e-action-combo-box.c +++ b/widgets/misc/e-action-combo-box.c @@ -22,10 +22,6 @@ #include -#define E_ACTION_COMBO_BOX_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_ACTION_COMBO_BOX, EActionComboBoxPrivate)) - enum { COLUMN_ACTION, COLUMN_SORT @@ -319,7 +315,7 @@ action_combo_box_get_property (GObject *object, static void action_combo_box_dispose (GObject *object) { - EActionComboBoxPrivate *priv = E_ACTION_COMBO_BOX_GET_PRIVATE (object); + EActionComboBoxPrivate *priv = E_ACTION_COMBO_BOX (object)->priv; if (priv->action != NULL) { g_object_unref (priv->action); @@ -340,7 +336,7 @@ action_combo_box_dispose (GObject *object) static void action_combo_box_finalize (GObject *object) { - EActionComboBoxPrivate *priv = E_ACTION_COMBO_BOX_GET_PRIVATE (object); + EActionComboBoxPrivate *priv = E_ACTION_COMBO_BOX (object)->priv; g_hash_table_destroy (priv->index); @@ -431,7 +427,7 @@ e_action_combo_box_class_init (EActionComboBoxClass *class) static void e_action_combo_box_init (EActionComboBox *combo_box) { - combo_box->priv = E_ACTION_COMBO_BOX_GET_PRIVATE (combo_box); + combo_box->priv = G_TYPE_INSTANCE_GET_PRIVATE (combo_box, E_TYPE_ACTION_COMBO_BOX, EActionComboBoxPrivate); combo_box->priv->index = g_hash_table_new_full ( g_direct_hash, g_direct_equal, -- cgit v1.2.3