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 /e-util/e-activity.c | |
| parent | 1a4be6c521d674c4a60e54203521e2721b81b921 (diff) | |
| download | gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.tar.gz gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.tar.zst gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.zip | |
Bug #614480 - Avoid using G_TYPE_INSTANCE_GET_PRIVATE repeatedly
Diffstat (limited to 'e-util/e-activity.c')
| -rw-r--r-- | e-util/e-activity.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/e-util/e-activity.c b/e-util/e-activity.c index 98ee4d1c0b..0b4089cca2 100644 --- a/e-util/e-activity.c +++ b/e-util/e-activity.c @@ -28,10 +28,6 @@ #include "e-util/e-util.h" #include "e-util/e-util-enumtypes.h" -#define E_ACTIVITY_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_ACTIVITY, EActivityPrivate)) - struct _EActivityPrivate { GCancellable *cancellable; EAlertSink *alert_sink; @@ -169,7 +165,7 @@ activity_dispose (GObject *object) { EActivityPrivate *priv; - priv = E_ACTIVITY_GET_PRIVATE (object); + priv = E_ACTIVITY (object)->priv; if (priv->alert_sink != NULL) { g_object_unref (priv->alert_sink); @@ -194,7 +190,7 @@ activity_finalize (GObject *object) { EActivityPrivate *priv; - priv = E_ACTIVITY_GET_PRIVATE (object); + priv = E_ACTIVITY (object)->priv; g_free (priv->icon_name); g_free (priv->text); @@ -336,7 +332,7 @@ e_activity_class_init (EActivityClass *class) static void e_activity_init (EActivity *activity) { - activity->priv = E_ACTIVITY_GET_PRIVATE (activity); + activity->priv = G_TYPE_INSTANCE_GET_PRIVATE (activity, E_TYPE_ACTIVITY, EActivityPrivate); } EActivity * |