diff options
author | Milan Crha <mcrha@redhat.com> | 2011-02-25 23:20:41 +0800 |
---|---|---|
committer | Milan Crha <mcrha@redhat.com> | 2011-02-25 23:20:41 +0800 |
commit | 1301cf02efdacd20fb5ce3e2554ae15b8f146e8a (patch) | |
tree | 8d5f3985a82ec7d330af27ee0a29a79a2f0ecfa3 /widgets/misc/e-charset-combo-box.c | |
parent | 1a4be6c521d674c4a60e54203521e2721b81b921 (diff) | |
download | gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.tar gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.tar.gz gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.tar.bz2 gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.tar.lz gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.tar.xz gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.tar.zst gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.zip |
Bug #614480 - Avoid using G_TYPE_INSTANCE_GET_PRIVATE repeatedly
Diffstat (limited to 'widgets/misc/e-charset-combo-box.c')
-rw-r--r-- | widgets/misc/e-charset-combo-box.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/widgets/misc/e-charset-combo-box.c b/widgets/misc/e-charset-combo-box.c index e2cf06e3d1..57d958b082 100644 --- a/widgets/misc/e-charset-combo-box.c +++ b/widgets/misc/e-charset-combo-box.c @@ -26,10 +26,6 @@ #include "e-util/e-charset.h" #include "e-util/e-util.h" -#define E_CHARSET_COMBO_BOX_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_CHARSET_COMBO_BOX, ECharsetComboBoxPrivate)) - #define DEFAULT_CHARSET "UTF-8" #define OTHER_VALUE G_MAXINT @@ -221,7 +217,7 @@ charset_combo_box_dispose (GObject *object) { ECharsetComboBoxPrivate *priv; - priv = E_CHARSET_COMBO_BOX_GET_PRIVATE (object); + priv = E_CHARSET_COMBO_BOX (object)->priv; if (priv->action_group != NULL) { g_object_unref (priv->action_group); @@ -244,7 +240,7 @@ charset_combo_box_finalize (GObject *object) { ECharsetComboBoxPrivate *priv; - priv = E_CHARSET_COMBO_BOX_GET_PRIVATE (object); + priv = E_CHARSET_COMBO_BOX (object)->priv; g_hash_table_destroy (priv->charset_index); @@ -257,7 +253,7 @@ charset_combo_box_changed (GtkComboBox *combo_box) { ECharsetComboBoxPrivate *priv; - priv = E_CHARSET_COMBO_BOX_GET_PRIVATE (combo_box); + priv = E_CHARSET_COMBO_BOX (combo_box)->priv; /* Chain up to parent's changed() method. */ GTK_COMBO_BOX_CLASS (e_charset_combo_box_parent_class)-> @@ -312,7 +308,7 @@ e_charset_combo_box_init (ECharsetComboBox *combo_box) (GDestroyNotify) g_free, (GDestroyNotify) g_object_unref); - combo_box->priv = E_CHARSET_COMBO_BOX_GET_PRIVATE (combo_box); + combo_box->priv = G_TYPE_INSTANCE_GET_PRIVATE (combo_box, E_TYPE_CHARSET_COMBO_BOX, ECharsetComboBoxPrivate); combo_box->priv->action_group = action_group; combo_box->priv->charset_index = charset_index; |