From 7a92d9cc82b7775a0f5cb1fde233119d435a79b6 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Tue, 10 Mar 2009 01:06:18 +0000
Subject: Add e_lookup_action() and e_lookup_action_group() to e-util, so I
 don't have to keep writing the algorithm over and over again.

Add EFileActivity, which provides a GCancellable for GIO operations.
Cancelling the activity cancels the GIO operation, and vice versa.
Also provides a handy GFileProgressCallback function which updates
the activity's "percent" property.

svn path=/branches/kill-bonobo/; revision=37396
---
 widgets/misc/e-activity.c | 58 +++++++++++++++++++++++------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

(limited to 'widgets/misc/e-activity.c')

diff --git a/widgets/misc/e-activity.c b/widgets/misc/e-activity.c
index 40ee0df35a..352300f023 100644
--- a/widgets/misc/e-activity.c
+++ b/widgets/misc/e-activity.c
@@ -33,8 +33,8 @@ struct _EActivityPrivate {
 	gchar *secondary_text;
 	gdouble percent;
 
+	guint allow_cancel	: 1;
 	guint blocking		: 1;
-	guint cancellable	: 1;
 	guint cancelled		: 1;
 	guint clickable		: 1;
 	guint completed		: 1;
@@ -42,8 +42,8 @@ struct _EActivityPrivate {
 
 enum {
 	PROP_0,
+	PROP_ALLOW_CANCEL,
 	PROP_BLOCKING,
-	PROP_CANCELLABLE,
 	PROP_CLICKABLE,
 	PROP_ICON_NAME,
 	PROP_PERCENT,
@@ -68,14 +68,14 @@ activity_set_property (GObject *object,
                        GParamSpec *pspec)
 {
 	switch (property_id) {
-		case PROP_BLOCKING:
-			e_activity_set_blocking (
+		case PROP_ALLOW_CANCEL:
+			e_activity_set_allow_cancel (
 				E_ACTIVITY (object),
 				g_value_get_boolean (value));
 			return;
 
-		case PROP_CANCELLABLE:
-			e_activity_set_cancellable (
+		case PROP_BLOCKING:
+			e_activity_set_blocking (
 				E_ACTIVITY (object),
 				g_value_get_boolean (value));
 			return;
@@ -121,15 +121,15 @@ activity_get_property (GObject *object,
                        GParamSpec *pspec)
 {
 	switch (property_id) {
-		case PROP_BLOCKING:
+		case PROP_ALLOW_CANCEL:
 			g_value_set_boolean (
-				value, e_activity_get_blocking (
+				value, e_activity_get_allow_cancel (
 				E_ACTIVITY (object)));
 			return;
 
-		case PROP_CANCELLABLE:
+		case PROP_BLOCKING:
 			g_value_set_boolean (
-				value, e_activity_get_cancellable (
+				value, e_activity_get_blocking (
 				E_ACTIVITY (object)));
 			return;
 
@@ -256,23 +256,23 @@ activity_class_init (EActivityClass *class)
 
 	g_object_class_install_property (
 		object_class,
-		PROP_BLOCKING,
+		PROP_ALLOW_CANCEL,
 		g_param_spec_boolean (
-			"blocking",
+			"allow-cancel",
 			NULL,
 			NULL,
-			TRUE,
+			FALSE,
 			G_PARAM_READWRITE |
 			G_PARAM_CONSTRUCT));
 
 	g_object_class_install_property (
 		object_class,
-		PROP_CANCELLABLE,
+		PROP_BLOCKING,
 		g_param_spec_boolean (
-			"cancellable",
+			"blocking",
 			NULL,
 			NULL,
-			FALSE,
+			TRUE,
 			G_PARAM_READWRITE |
 			G_PARAM_CONSTRUCT));
 
@@ -405,7 +405,7 @@ void
 e_activity_cancel (EActivity *activity)
 {
 	g_return_if_fail (E_IS_ACTIVITY (activity));
-	g_return_if_fail (activity->priv->cancellable);
+	g_return_if_fail (activity->priv->allow_cancel);
 
 	if (activity->priv->cancelled)
 		return;
@@ -468,41 +468,41 @@ e_activity_is_completed (EActivity *activity)
 }
 
 gboolean
-e_activity_get_blocking (EActivity *activity)
+e_activity_get_allow_cancel (EActivity *activity)
 {
 	g_return_val_if_fail (E_IS_ACTIVITY (activity), FALSE);
 
-	return activity->priv->blocking;
+	return activity->priv->allow_cancel;
 }
 
 void
-e_activity_set_blocking (EActivity *activity,
-                         gboolean blocking)
+e_activity_set_allow_cancel (EActivity *activity,
+                            gboolean allow_cancel)
 {
 	g_return_if_fail (E_IS_ACTIVITY (activity));
 
-	activity->priv->blocking = blocking;
+	activity->priv->allow_cancel = allow_cancel;
 
-	g_object_notify (G_OBJECT (activity), "blocking");
+	g_object_notify (G_OBJECT (activity), "allow-cancel");
 }
 
 gboolean
-e_activity_get_cancellable (EActivity *activity)
+e_activity_get_blocking (EActivity *activity)
 {
 	g_return_val_if_fail (E_IS_ACTIVITY (activity), FALSE);
 
-	return activity->priv->cancellable;
+	return activity->priv->blocking;
 }
 
 void
-e_activity_set_cancellable (EActivity *activity,
-                            gboolean cancellable)
+e_activity_set_blocking (EActivity *activity,
+                         gboolean blocking)
 {
 	g_return_if_fail (E_IS_ACTIVITY (activity));
 
-	activity->priv->cancellable = cancellable;
+	activity->priv->blocking = blocking;
 
-	g_object_notify (G_OBJECT (activity), "cancellable");
+	g_object_notify (G_OBJECT (activity), "blocking");
 }
 
 gboolean
-- 
cgit v1.2.3