diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2012-01-25 11:57:48 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-01-25 11:57:48 +0800 |
| commit | b17d51a4544badf95edf7cf1d0def2f6ed6a45e9 (patch) | |
| tree | 93a30f04df42f2eda59b6f2d915870f5b4a3bf67 /widgets | |
| parent | bab2f2ef127bcb3ac7a12b4790dfd4501623b521 (diff) | |
| download | gsoc2013-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 'widgets')
| -rw-r--r-- | widgets/misc/e-activity-bar.c | 9 | ||||
| -rw-r--r-- | widgets/misc/e-activity-proxy.c | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/widgets/misc/e-activity-bar.c b/widgets/misc/e-activity-bar.c index 5407814ab6..f85b403bd7 100644 --- a/widgets/misc/e-activity-bar.c +++ b/widgets/misc/e-activity-bar.c @@ -22,6 +22,10 @@ #include "e-activity-bar.h" +#define E_ACTIVITY_BAR_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), E_TYPE_ACTIVITY_BAR, EActivityBarPrivate)) + #define FEEDBACK_PERIOD 1 /* seconds */ #define COMPLETED_ICON_NAME "emblem-default" @@ -206,7 +210,7 @@ activity_bar_dispose (GObject *object) { EActivityBarPrivate *priv; - priv = E_ACTIVITY_BAR (object)->priv; + priv = E_ACTIVITY_BAR_GET_PRIVATE (object); if (priv->timeout_id > 0) { g_source_remove (priv->timeout_id); @@ -257,8 +261,7 @@ e_activity_bar_init (EActivityBar *bar) GtkWidget *container; GtkWidget *widget; - bar->priv = G_TYPE_INSTANCE_GET_PRIVATE ( - bar, E_TYPE_ACTIVITY_BAR, EActivityBarPrivate); + bar->priv = E_ACTIVITY_BAR_GET_PRIVATE (bar); container = gtk_info_bar_get_content_area (GTK_INFO_BAR (bar)); diff --git a/widgets/misc/e-activity-proxy.c b/widgets/misc/e-activity-proxy.c index f34807cba0..7547088aac 100644 --- a/widgets/misc/e-activity-proxy.c +++ b/widgets/misc/e-activity-proxy.c @@ -27,6 +27,10 @@ #include <glib/gi18n.h> +#define E_ACTIVITY_PROXY_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), E_TYPE_ACTIVITY_PROXY, EActivityProxyPrivate)) + #define FEEDBACK_PERIOD 1 /* seconds */ #define COMPLETED_ICON_NAME "emblem-default" @@ -212,7 +216,7 @@ activity_proxy_dispose (GObject *object) { EActivityProxyPrivate *priv; - priv = E_ACTIVITY_PROXY (object)->priv; + priv = E_ACTIVITY_PROXY_GET_PRIVATE (object); if (priv->timeout_id > 0) { g_source_remove (priv->timeout_id); @@ -263,8 +267,7 @@ e_activity_proxy_init (EActivityProxy *proxy) GtkWidget *container; GtkWidget *widget; - proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE ( - proxy, E_TYPE_ACTIVITY_PROXY, EActivityProxyPrivate); + proxy->priv = E_ACTIVITY_PROXY_GET_PRIVATE (proxy); gtk_frame_set_shadow_type (GTK_FRAME (proxy), GTK_SHADOW_IN); |