callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EActivity cleanups.

Browse Source
This commit is contained in:
Matthew Barnes
2012-01-24 22:57:48 -05:00
parent bab2f2ef12
commit b17d51a454
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
e-util/e-activity.c
View File

@ -32,6 +32,10 @@
#include "e-util/e-util.h" #include "e-util/e-util.h"
#include "e-util/e-util-enumtypes.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 { struct _EActivityPrivate {
GCancellable *cancellable; GCancellable *cancellable;
EAlertSink *alert_sink; EAlertSink *alert_sink;
@ -173,7 +177,7 @@ activity_dispose (GObject *object)
{ {
EActivityPrivate *priv; EActivityPrivate *priv;
priv = E_ACTIVITY (object)->priv; priv = E_ACTIVITY_GET_PRIVATE (object);
if (priv->alert_sink != NULL) { if (priv->alert_sink != NULL) {
g_object_unref (priv->alert_sink); g_object_unref (priv->alert_sink);
@ -198,7 +202,7 @@ activity_finalize (GObject *object)
{ {
EActivityPrivate *priv; EActivityPrivate *priv;
priv = E_ACTIVITY (object)->priv; priv = E_ACTIVITY_GET_PRIVATE (object);
g_free (priv->icon_name); g_free (priv->icon_name);
g_free (priv->text); g_free (priv->text);
@ -353,9 +357,7 @@ e_activity_class_init (EActivityClass *class)
static void static void
e_activity_init (EActivity *activity) e_activity_init (EActivity *activity)
{ {
activity->priv = G_TYPE_INSTANCE_GET_PRIVATE ( activity->priv = E_ACTIVITY_GET_PRIVATE (activity);
activity, E_TYPE_ACTIVITY, EActivityPrivate);
activity->priv->warn_bogus_percent = TRUE; activity->priv->warn_bogus_percent = TRUE;
} }

9
widgets/misc/e-activity-bar.c
View File

@ -22,6 +22,10 @@
#include "e-activity-bar.h" #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 FEEDBACK_PERIOD 1 /* seconds */
#define COMPLETED_ICON_NAME "emblem-default" #define COMPLETED_ICON_NAME "emblem-default"
@ -206,7 +210,7 @@ activity_bar_dispose (GObject *object)
{ {
EActivityBarPrivate *priv; EActivityBarPrivate *priv;
priv = E_ACTIVITY_BAR (object)->priv; priv = E_ACTIVITY_BAR_GET_PRIVATE (object);
if (priv->timeout_id > 0) { if (priv->timeout_id > 0) {
g_source_remove (priv->timeout_id); g_source_remove (priv->timeout_id);
@ -257,8 +261,7 @@ e_activity_bar_init (EActivityBar *bar)
GtkWidget *container; GtkWidget *container;
GtkWidget *widget; GtkWidget *widget;
bar->priv = G_TYPE_INSTANCE_GET_PRIVATE ( bar->priv = E_ACTIVITY_BAR_GET_PRIVATE (bar);
bar, E_TYPE_ACTIVITY_BAR, EActivityBarPrivate);
container = gtk_info_bar_get_content_area (GTK_INFO_BAR (bar)); container = gtk_info_bar_get_content_area (GTK_INFO_BAR (bar));

9
widgets/misc/e-activity-proxy.c
View File

@ -27,6 +27,10 @@
#include <glib/gi18n.h> #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 FEEDBACK_PERIOD 1 /* seconds */
#define COMPLETED_ICON_NAME "emblem-default" #define COMPLETED_ICON_NAME "emblem-default"
@ -212,7 +216,7 @@ activity_proxy_dispose (GObject *object)
{ {
EActivityProxyPrivate *priv; EActivityProxyPrivate *priv;
priv = E_ACTIVITY_PROXY (object)->priv; priv = E_ACTIVITY_PROXY_GET_PRIVATE (object);
if (priv->timeout_id > 0) { if (priv->timeout_id > 0) {
g_source_remove (priv->timeout_id); g_source_remove (priv->timeout_id);
@ -263,8 +267,7 @@ e_activity_proxy_init (EActivityProxy *proxy)
GtkWidget *container; GtkWidget *container;
GtkWidget *widget; GtkWidget *widget;
proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE ( proxy->priv = E_ACTIVITY_PROXY_GET_PRIVATE (proxy);
proxy, E_TYPE_ACTIVITY_PROXY, EActivityProxyPrivate);
gtk_frame_set_shadow_type (GTK_FRAME (proxy), GTK_SHADOW_IN); gtk_frame_set_shadow_type (GTK_FRAME (proxy), GTK_SHADOW_IN);