aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2012-01-25 11:57:48 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-01-25 11:57:48 +0800
commitb17d51a4544badf95edf7cf1d0def2f6ed6a45e9 (patch)
tree93a30f04df42f2eda59b6f2d915870f5b4a3bf67 /e-util
parentbab2f2ef127bcb3ac7a12b4790dfd4501623b521 (diff)
downloadgsoc2013-evolution-b17d51a4544badf95edf7cf1d0def2f6ed6a45e9.tar
gsoc2013-evolution-b17d51a4544badf95edf7cf1d0def2f6ed6a45e9.tar.gz
gsoc2013-evolution-b17d51a4544badf95edf7cf1d0def2f6ed6a45e9.tar.bz2
gsoc2013-evolution-b17d51a4544badf95edf7cf1d0def2f6ed6a45e9.tar.lz
gsoc2013-evolution-b17d51a4544badf95edf7cf1d0def2f6ed6a45e9.tar.xz
gsoc2013-evolution-b17d51a4544badf95edf7cf1d0def2f6ed6a45e9.tar.zst
gsoc2013-evolution-b17d51a4544badf95edf7cf1d0def2f6ed6a45e9.zip
EActivity cleanups.
Diffstat (limited to 'e-util')
-rw-r--r--e-util/e-activity.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/e-util/e-activity.c b/e-util/e-activity.c
index 1c1655f010..ae34366393 100644
--- a/e-util/e-activity.c
+++ b/e-util/e-activity.c
@@ -32,6 +32,10 @@
#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;
@@ -173,7 +177,7 @@ activity_dispose (GObject *object)
{
EActivityPrivate *priv;
- priv = E_ACTIVITY (object)->priv;
+ priv = E_ACTIVITY_GET_PRIVATE (object);
if (priv->alert_sink != NULL) {
g_object_unref (priv->alert_sink);
@@ -198,7 +202,7 @@ activity_finalize (GObject *object)
{
EActivityPrivate *priv;
- priv = E_ACTIVITY (object)->priv;
+ priv = E_ACTIVITY_GET_PRIVATE (object);
g_free (priv->icon_name);
g_free (priv->text);
@@ -353,9 +357,7 @@ e_activity_class_init (EActivityClass *class)
static void
e_activity_init (EActivity *activity)
{
- activity->priv = G_TYPE_INSTANCE_GET_PRIVATE (
- activity, E_TYPE_ACTIVITY, EActivityPrivate);
-
+ activity->priv = E_ACTIVITY_GET_PRIVATE (activity);
activity->priv->warn_bogus_percent = TRUE;
}