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 /addressbook/gui/widgets/e-addressbook-selector.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 'addressbook/gui/widgets/e-addressbook-selector.c')
-rw-r--r-- | addressbook/gui/widgets/e-addressbook-selector.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/addressbook/gui/widgets/e-addressbook-selector.c b/addressbook/gui/widgets/e-addressbook-selector.c index 018205e09f..727bf3c402 100644 --- a/addressbook/gui/widgets/e-addressbook-selector.c +++ b/addressbook/gui/widgets/e-addressbook-selector.c @@ -25,10 +25,6 @@ #include <eab-book-util.h> #include <eab-contact-merging.h> -#define E_ADDRESSBOOK_SELECTOR_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_ADDRESSBOOK_SELECTOR, EAddressbookSelectorPrivate)) - typedef struct _MergeContext MergeContext; struct _EAddressbookSelectorPrivate { @@ -219,7 +215,7 @@ addressbook_selector_dispose (GObject *object) { EAddressbookSelectorPrivate *priv; - priv = E_ADDRESSBOOK_SELECTOR_GET_PRIVATE (object); + priv = E_ADDRESSBOOK_SELECTOR (object)->priv; if (priv->current_view != NULL) { g_object_unref (priv->current_view); @@ -258,7 +254,7 @@ addressbook_selector_data_dropped (ESourceSelector *selector, const gchar *string; gboolean remove_from_source; - priv = E_ADDRESSBOOK_SELECTOR_GET_PRIVATE (selector); + priv = E_ADDRESSBOOK_SELECTOR (selector)->priv; g_return_val_if_fail (priv->current_view != NULL, FALSE); string = (const gchar *) gtk_selection_data_get_data (selection_data); @@ -324,7 +320,7 @@ addressbook_selector_class_init (EAddressbookSelectorClass *class) static void addressbook_selector_init (EAddressbookSelector *selector) { - selector->priv = E_ADDRESSBOOK_SELECTOR_GET_PRIVATE (selector); + selector->priv = G_TYPE_INSTANCE_GET_PRIVATE (selector, E_TYPE_ADDRESSBOOK_SELECTOR, EAddressbookSelectorPrivate); gtk_drag_dest_set ( GTK_WIDGET (selector), GTK_DEST_DEFAULT_ALL, |