Replace EActivityHandler with a new activity-tracking system that uses

EActivity objects instead of numeric handler IDs.  Create an EActivity,
configure it, and (optionally) connect to its "cancelled" and "completed"
signals.  Then hand it to the shell view via e_shell_view_add_activity().
When finished with the activity, call e_activity_finish() and unref it.

svn path=/branches/kill-bonobo/; revision=36391

7 files changed, 935 insertions, 354 deletions

diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index 0b7eca1f12..e5ddeecc06 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -37,8 +37,10 @@ widgetsinclude_HEADERS =			\
 	$(pilot_headers)			\
 	e-account-combo-box.h			\
 	e-action-combo-box.h			\
-	e-attachment.h				\
+	e-activity.h				\
+	e-activity-proxy.h			\
 	e-attachment-bar.h			\
+	e-attachment.h				\
 	e-spinner.c				\
 	e-spinner.h				\
 	e-calendar.h				\
@@ -58,7 +60,6 @@ widgetsinclude_HEADERS =			\
 	e-preferences-window.h			\
 	e-online-button.h			\
 	e-search-bar.h				\
-	e-task-widget.h				\
 	e-send-options.h			\
 	e-url-entry.h				\
 	e-canvas-background.h			\
@@ -84,6 +85,8 @@ libemiscwidgets_la_SOURCES =			\
 	$(pilot_sources)			\
 	e-account-combo-box.c			\
 	e-action-combo-box.c			\
+	e-activity.c				\
+	e-activity-proxy.c			\
 	e-calendar.c				\
 	e-attachment.c				\
 	e-attachment-bar.c			\
@@ -103,7 +106,6 @@ libemiscwidgets_la_SOURCES =			\
 	e-preferences-window.c			\
 	e-online-button.c			\
 	e-search-bar.c				\
-	e-task-widget.c				\
 	e-send-options.c			\
 	e-url-entry.c				\
 	e-canvas-background.c			\
diff --git a/widgets/misc/e-activity-proxy.c b/widgets/misc/e-activity-proxy.c
new file mode 100644
index 0000000000..9ae9143bb7
--- /dev/null
+++ b/widgets/misc/e-activity-proxy.c
@@ -0,0 +1,313 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+ * e-activity-proxy.c
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "e-activity-proxy.h"
+
+#include <glib/gi18n.h>
+#include <e-spinner.h>
+
+#define E_ACTIVITY_PROXY_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_ACTIVITY_PROXY, EActivityProxyPrivate))
+
+struct _EActivityProxyPrivate {
+	EActivity *activity;
+	GtkWidget *image;
+	GtkWidget *label;
+	GtkWidget *button;
+	GtkWidget *spinner;
+};
+
+enum {
+	PROP_0,
+	PROP_ACTIVITY
+};
+
+static gpointer parent_class;
+
+static void
+activity_proxy_update (EActivityProxy *proxy)
+{
+	EActivity *activity = proxy->priv->activity;
+	const gchar *icon_name;
+	gboolean cancellable;
+	gboolean cancelled;
+	gboolean completed;
+	gboolean sensitive;
+	gchar *description;
+
+	cancellable = e_activity_get_cancellable (activity);
+	cancelled = e_activity_is_cancelled (activity);
+	completed = e_activity_is_completed (activity);
+	icon_name = e_activity_get_icon_name (activity);
+
+	description = e_activity_describe (activity);
+	gtk_widget_set_tooltip_text (GTK_WIDGET (proxy), description);
+	gtk_label_set_text (GTK_LABEL (proxy->priv->label), description);
+	g_free (description);
+
+	if (icon_name != NULL) {
+		gtk_image_set_from_icon_name (
+			GTK_IMAGE (proxy->priv->image),
+			icon_name, GTK_ICON_SIZE_MENU);
+		e_spinner_stop (E_SPINNER (proxy->priv->spinner));
+		gtk_widget_show (proxy->priv->image);
+		gtk_widget_hide (proxy->priv->spinner);
+	} else {
+		e_spinner_start (E_SPINNER (proxy->priv->spinner));
+		gtk_widget_show (proxy->priv->spinner);
+		gtk_widget_hide (proxy->priv->image);
+	}
+
+	if (cancellable)
+		gtk_widget_show (proxy->priv->button);
+	else
+		gtk_widget_hide (proxy->priv->button);
+
+	sensitive = !(cancelled || completed);
+	gtk_widget_set_sensitive (proxy->priv->button, sensitive);
+}
+
+static void
+activity_proxy_set_activity (EActivityProxy *proxy,
+                             EActivity *activity)
+{
+	g_return_if_fail (proxy->priv->activity == NULL);
+
+	proxy->priv->activity = g_object_ref (activity);
+}
+
+static void
+activity_proxy_set_property (GObject *object,
+                             guint property_id,
+                             const GValue *value,
+                             GParamSpec *pspec)
+{
+	switch (property_id) {
+		case PROP_ACTIVITY:
+			activity_proxy_set_activity (
+				E_ACTIVITY_PROXY (object),
+				g_value_get_object (value));
+			return;
+	}
+
+	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+}
+
+static void
+activity_proxy_get_property (GObject *object,
+                             guint property_id,
+                             GValue *value,
+                             GParamSpec *pspec)
+{
+	switch (property_id) {
+		case PROP_ACTIVITY:
+			g_value_set_object (
+				value, e_activity_proxy_get_activity (
+				E_ACTIVITY_PROXY (object)));
+			return;
+	}
+
+	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+}
+
+static void
+activity_proxy_dispose (GObject *object)
+{
+	EActivityProxyPrivate *priv;
+
+	priv = E_ACTIVITY_PROXY_GET_PRIVATE (object);
+
+	if (priv->activity != NULL) {
+		g_object_unref (priv->activity);
+		priv->activity = NULL;
+	}
+
+	if (priv->image != NULL) {
+		g_object_unref (priv->image);
+		priv->image = NULL;
+	}
+
+	if (priv->label != NULL) {
+		g_object_unref (priv->label);
+		priv->label = NULL;
+	}
+
+	if (priv->button != NULL) {
+		g_object_unref (priv->button);
+		priv->button = NULL;
+	}
+
+	if (priv->spinner != NULL) {
+		g_object_unref (priv->spinner);
+		priv->spinner = NULL;
+	}
+
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+activity_proxy_constructed (GObject *object)
+{
+	EActivityProxy *proxy;
+
+	proxy = E_ACTIVITY_PROXY (object);
+
+	g_signal_connect_swapped (
+		proxy->priv->button, "clicked",
+		G_CALLBACK (e_activity_cancel), proxy->priv->activity);
+
+	g_signal_connect_swapped (
+		proxy->priv->activity, "cancelled",
+		G_CALLBACK (activity_proxy_update), proxy);
+
+	g_signal_connect_swapped (
+		proxy->priv->activity, "completed",
+		G_CALLBACK (activity_proxy_update), proxy);
+
+	g_signal_connect_swapped (
+		proxy->priv->activity, "notify",
+		G_CALLBACK (activity_proxy_update), proxy);
+
+	activity_proxy_update (proxy);
+}
+
+static void
+activity_proxy_class_init (EActivityProxyClass *class)
+{
+	GObjectClass *object_class;
+
+	parent_class = g_type_class_peek_parent (class);
+	g_type_class_add_private (class, sizeof (EActivityProxyPrivate));
+
+	object_class = G_OBJECT_CLASS (class);
+	object_class->set_property = activity_proxy_set_property;
+	object_class->get_property = activity_proxy_get_property;
+	object_class->dispose = activity_proxy_dispose;
+	object_class->constructed = activity_proxy_constructed;
+
+	g_object_class_install_property (
+		object_class,
+		PROP_ACTIVITY,
+		g_param_spec_object (
+			"activity",
+			NULL,
+			NULL,
+			E_TYPE_ACTIVITY,
+			G_PARAM_READWRITE |
+			G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+activity_proxy_init (EActivityProxy *proxy)
+{
+	GtkWidget *container;
+	GtkWidget *widget;
+
+	proxy->priv = E_ACTIVITY_PROXY_GET_PRIVATE (proxy);
+
+	container = GTK_WIDGET (proxy);
+
+	widget = gtk_frame_new (NULL);
+	gtk_frame_set_shadow_type (GTK_FRAME (widget), GTK_SHADOW_IN);
+	gtk_container_add (GTK_CONTAINER (container), widget);
+	gtk_widget_show (widget);
+
+	container = widget;
+
+	widget = gtk_hbox_new (FALSE, 3);
+	gtk_container_add (GTK_CONTAINER (container), widget);
+	gtk_widget_show (widget);
+
+	container = widget;
+
+	widget = e_spinner_new ();
+	e_spinner_set_size (E_SPINNER (widget), GTK_ICON_SIZE_MENU);
+	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+	proxy->priv->spinner = g_object_ref (widget);
+	gtk_widget_show (widget);
+
+	widget = gtk_image_new ();
+	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+	proxy->priv->image = g_object_ref (widget);
+	gtk_widget_hide (widget);
+
+	widget = gtk_label_new (NULL);
+	gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
+	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
+	proxy->priv->label = g_object_ref (widget);
+	gtk_widget_show (widget);
+
+	widget = gtk_button_new ();
+	gtk_button_set_image (
+		GTK_BUTTON (widget), gtk_image_new_from_stock (
+		GTK_STOCK_STOP, GTK_ICON_SIZE_MENU));
+	gtk_button_set_relief (GTK_BUTTON (widget), GTK_RELIEF_NONE);
+	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+	gtk_widget_set_tooltip_text (widget, _("Cancel"));
+	proxy->priv->button = g_object_ref (widget);
+	gtk_widget_show (widget);
+}
+
+GType
+e_activity_proxy_get_type (void)
+{
+	static GType type = 0;
+
+	if (G_UNLIKELY (type == 0)) {
+		static const GTypeInfo type_info = {
+			sizeof (EActivityProxyClass),
+			(GBaseInitFunc) NULL,
+			(GBaseFinalizeFunc) NULL,
+			(GClassInitFunc) activity_proxy_class_init,
+			(GClassFinalizeFunc) NULL,
+			NULL,  /* class_data */
+			sizeof (EActivityProxy),
+			0,     /* n_preallocs */
+			(GInstanceInitFunc) activity_proxy_init,
+			NULL   /* value_table */
+		};
+
+		type = g_type_register_static (
+			GTK_TYPE_EVENT_BOX, "EActivityProxy", &type_info, 0);
+	}
+
+	return type;
+}
+
+GtkWidget *
+e_activity_proxy_new (EActivity *activity)
+{
+	g_return_val_if_fail (E_IS_ACTIVITY (activity), NULL);
+
+	return g_object_new (
+		E_TYPE_ACTIVITY_PROXY,
+		"activity", activity, NULL);
+}
+
+EActivity *
+e_activity_proxy_get_activity (EActivityProxy *proxy)
+{
+	g_return_val_if_fail (E_IS_ACTIVITY_PROXY (proxy), NULL);
+
+	return proxy->priv->activity;
+}
diff --git a/widgets/misc/e-activity-proxy.h b/widgets/misc/e-activity-proxy.h
new file mode 100644
index 0000000000..bc9e97dfeb
--- /dev/null
+++ b/widgets/misc/e-activity-proxy.h
@@ -0,0 +1,68 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+ * e-activity-proxy.h
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef E_ACTIVITY_PROXY_H
+#define E_ACTIVITY_PROXY_H
+
+#include <gtk/gtk.h>
+#include <e-activity.h>
+
+/* Standard GObject macros */
+#define E_TYPE_ACTIVITY_PROXY \
+	(e_activity_proxy_get_type ())
+#define E_ACTIVITY_PROXY(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_ACTIVITY_PROXY, EActivityProxy))
+#define E_ACTIVITY_PROXY_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_ACTIVITY_PROXY, EActivityProxyClass))
+#define E_IS_ACTIVITY_PROXY(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_ACTIVITY_PROXY))
+#define E_IS_ACTIVITY_PROXY_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_ACTIVITY_PROXY))
+#define E_ACTIVITY_PROXY_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_ACTIVITY_PROXY, EActivityProxyClass))
+
+G_BEGIN_DECLS
+
+typedef struct _EActivityProxy EActivityProxy;
+typedef struct _EActivityProxyClass EActivityProxyClass;
+typedef struct _EActivityProxyPrivate EActivityProxyPrivate;
+
+struct _EActivityProxy {
+	GtkEventBox parent;
+	EActivityProxyPrivate *priv;
+};
+
+struct _EActivityProxyClass {
+	GtkEventBoxClass parent_class;
+};
+
+GType		e_activity_proxy_get_type	(void);
+GtkWidget *	e_activity_proxy_new		(EActivity *activity);
+EActivity *	e_activity_proxy_get_activity	(EActivityProxy *proxy);
+
+G_END_DECLS
+
+#endif /* E_ACTIVITY_PROXY_H */
diff --git a/widgets/misc/e-activity.c b/widgets/misc/e-activity.c
new file mode 100644
index 0000000000..251efbb758
--- /dev/null
+++ b/widgets/misc/e-activity.c
@@ -0,0 +1,463 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+ * e-activity.c
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "e-activity.h"
+
+#include <glib/gi18n.h>
+
+#define E_ACTIVITY_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_ACTIVITY, EActivityPrivate))
+
+struct _EActivityPrivate {
+	gchar *icon_name;
+	gchar *primary_text;
+	gchar *secondary_text;
+	gdouble percent;
+	gboolean cancellable;
+	guint cancelled : 1;
+	guint completed : 1;
+};
+
+enum {
+	PROP_0,
+	PROP_CANCELLABLE,
+	PROP_ICON_NAME,
+	PROP_PERCENT,
+	PROP_PRIMARY_TEXT,
+	PROP_SECONDARY_TEXT
+};
+
+enum {
+	CANCELLED,
+	COMPLETED,
+	LAST_SIGNAL
+};
+
+static gpointer parent_class;
+static gulong signals[LAST_SIGNAL];
+
+static void
+activity_set_property (GObject *object,
+                       guint property_id,
+                       const GValue *value,
+                       GParamSpec *pspec)
+{
+	switch (property_id) {
+		case PROP_CANCELLABLE:
+			e_activity_set_cancellable (
+				E_ACTIVITY (object),
+				g_value_get_boolean (value));
+			return;
+
+		case PROP_ICON_NAME:
+			e_activity_set_icon_name (
+				E_ACTIVITY (object),
+				g_value_get_string (value));
+			return;
+
+		case PROP_PERCENT:
+			e_activity_set_percent (
+				E_ACTIVITY (object),
+				g_value_get_double (value));
+			return;
+
+		case PROP_PRIMARY_TEXT:
+			e_activity_set_primary_text (
+				E_ACTIVITY (object),
+				g_value_get_string (value));
+			return;
+
+		case PROP_SECONDARY_TEXT:
+			e_activity_set_secondary_text (
+				E_ACTIVITY (object),
+				g_value_get_string (value));
+			return;
+	}
+
+	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+}
+
+static void
+activity_get_property (GObject *object,
+                       guint property_id,
+                       GValue *value,
+                       GParamSpec *pspec)
+{
+	switch (property_id) {
+		case PROP_CANCELLABLE:
+			g_value_set_boolean (
+				value, e_activity_get_cancellable (
+				E_ACTIVITY (object)));
+			return;
+
+		case PROP_ICON_NAME:
+			g_value_set_string (
+				value, e_activity_get_icon_name (
+				E_ACTIVITY (object)));
+			return;
+
+		case PROP_PERCENT:
+			g_value_set_double (
+				value, e_activity_get_percent (
+				E_ACTIVITY (object)));
+			return;
+
+		case PROP_PRIMARY_TEXT:
+			g_value_set_string (
+				value, e_activity_get_primary_text (
+				E_ACTIVITY (object)));
+			return;
+
+		case PROP_SECONDARY_TEXT:
+			g_value_set_string (
+				value, e_activity_get_secondary_text (
+				E_ACTIVITY (object)));
+			return;
+	}
+
+	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+}
+
+static void
+activity_finalize (GObject *object)
+{
+	EActivityPrivate *priv;
+
+	priv = E_ACTIVITY_GET_PRIVATE (object);
+
+	g_free (priv->icon_name);
+	g_free (priv->primary_text);
+	g_free (priv->secondary_text);
+
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+activity_class_init (EActivityClass *class)
+{
+	GObjectClass *object_class;
+
+	parent_class = g_type_class_peek_parent (class);
+	g_type_class_add_private (class, sizeof (EActivityPrivate));
+
+	object_class = G_OBJECT_CLASS (class);
+	object_class->set_property = activity_set_property;
+	object_class->get_property = activity_get_property;
+	object_class->finalize = activity_finalize;
+
+	g_object_class_install_property (
+		object_class,
+		PROP_CANCELLABLE,
+		g_param_spec_boolean (
+			"cancellable",
+			NULL,
+			NULL,
+			FALSE,
+			G_PARAM_READWRITE |
+			G_PARAM_CONSTRUCT));
+
+	g_object_class_install_property (
+		object_class,
+		PROP_ICON_NAME,
+		g_param_spec_string (
+			"icon-name",
+			NULL,
+			NULL,
+			NULL,
+			G_PARAM_READWRITE |
+			G_PARAM_CONSTRUCT));
+
+	g_object_class_install_property (
+		object_class,
+		PROP_PERCENT,
+		g_param_spec_double (
+			"percent",
+			NULL,
+			NULL,
+			-G_MAXDOUBLE,
+			G_MAXDOUBLE,
+			-1.0,
+			G_PARAM_READWRITE |
+			G_PARAM_CONSTRUCT));
+
+	g_object_class_install_property (
+		object_class,
+		PROP_PRIMARY_TEXT,
+		g_param_spec_string (
+			"primary-text",
+			NULL,
+			NULL,
+			NULL,
+			G_PARAM_READWRITE |
+			G_PARAM_CONSTRUCT));
+
+	g_object_class_install_property (
+		object_class,
+		PROP_SECONDARY_TEXT,
+		g_param_spec_string (
+			"secondary-text",
+			NULL,
+			NULL,
+			NULL,
+			G_PARAM_READWRITE |
+			G_PARAM_CONSTRUCT));
+
+	signals[CANCELLED] = g_signal_new (
+		"cancelled",
+		G_OBJECT_CLASS_TYPE (object_class),
+		G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+		0, NULL, NULL,
+		g_cclosure_marshal_VOID__VOID,
+		G_TYPE_NONE, 0);
+
+	signals[COMPLETED] = g_signal_new (
+		"completed",
+		G_OBJECT_CLASS_TYPE (object_class),
+		G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+		0, NULL, NULL,
+		g_cclosure_marshal_VOID__VOID,
+		G_TYPE_NONE, 0);
+}
+
+static void
+activity_init (EActivity *activity)
+{
+	activity->priv = E_ACTIVITY_GET_PRIVATE (activity);
+}
+
+GType
+e_activity_get_type (void)
+{
+	static GType type = 0;
+
+	if (G_UNLIKELY (type == 0)) {
+		static const GTypeInfo type_info = {
+			sizeof (EActivityClass),
+			(GBaseInitFunc) NULL,
+			(GBaseFinalizeFunc) NULL,
+			(GClassInitFunc) activity_class_init,
+			(GClassFinalizeFunc) NULL,
+			NULL,  /* class_data */
+			sizeof (EActivity),
+			0,     /* n_preallocs */
+			(GInstanceInitFunc) activity_init,
+			NULL   /* value_table */
+		};
+
+		type = g_type_register_static (
+			G_TYPE_OBJECT, "EActivity", &type_info, 0);
+	}
+
+	return type;
+}
+
+EActivity *
+e_activity_new (const gchar *primary_text)
+{
+	return g_object_new (
+		E_TYPE_ACTIVITY,
+		"primary-text", primary_text, NULL);
+}
+
+void
+e_activity_cancel (EActivity *activity)
+{
+	g_return_if_fail (E_IS_ACTIVITY (activity));
+	g_return_if_fail (activity->priv->cancellable);
+
+	if (activity->priv->cancelled)
+		return;
+
+	if (activity->priv->completed)
+		return;
+
+	activity->priv->cancelled = TRUE;
+	g_signal_emit (activity, signals[CANCELLED], 0);
+}
+
+void
+e_activity_complete (EActivity *activity)
+{
+	g_return_if_fail (E_IS_ACTIVITY (activity));
+
+	if (activity->priv->cancelled)
+		return;
+
+	if (activity->priv->completed)
+		return;
+
+	activity->priv->completed = TRUE;
+	g_signal_emit (activity, signals[COMPLETED], 0);
+}
+
+gchar *
+e_activity_describe (EActivity *activity)
+{
+	GString *string;
+	const gchar *text;
+	gboolean cancelled;
+	gboolean completed;
+	gdouble percent;
+
+	g_return_val_if_fail (E_IS_ACTIVITY (activity), NULL);
+
+	string = g_string_sized_new (256);
+	text = e_activity_get_primary_text (activity);
+	cancelled = e_activity_is_cancelled (activity);
+	completed = e_activity_is_completed (activity);
+	percent = e_activity_get_percent (activity);
+
+	if (cancelled) {
+		/* Translators: This is a cancelled activity. */
+		g_string_printf (string, _("%s (cancelled)"), text);
+	} else if (completed) {
+		/* Translators: This is a completed activity. */
+		g_string_printf (string, _("%s (completed)"), text);
+	} else if (percent < 0.0) {
+		/* Translators: This is an activity whose percent
+		 * complete is unknown. */
+		g_string_printf (string, _("%s (...)"), text);
+	} else {
+		/* Translators: This is an activity whose percent
+		 * complete is known. */
+		g_string_printf (
+			string, _("%s (%d%% complete"), text,
+			(gint) (percent * 100.0 + 0.5));
+	}
+
+	return g_string_free (string, FALSE);
+}
+
+gboolean
+e_activity_is_cancelled (EActivity *activity)
+{
+	g_return_val_if_fail (E_IS_ACTIVITY (activity), FALSE);
+
+	return activity->priv->cancelled;
+}
+
+gboolean
+e_activity_is_completed (EActivity *activity)
+{
+	g_return_val_if_fail (E_IS_ACTIVITY (activity), FALSE);
+
+	return activity->priv->completed;
+}
+
+gboolean
+e_activity_get_cancellable (EActivity *activity)
+{
+	g_return_val_if_fail (E_IS_ACTIVITY (activity), FALSE);
+
+	return activity->priv->cancellable;
+}
+
+void
+e_activity_set_cancellable (EActivity *activity,
+                            gboolean cancellable)
+{
+	g_return_if_fail (E_IS_ACTIVITY (activity));
+
+	activity->priv->cancellable = cancellable;
+
+	g_object_notify (G_OBJECT (activity), "cancellable");
+}
+
+const gchar *
+e_activity_get_icon_name (EActivity *activity)
+{
+	g_return_val_if_fail (E_IS_ACTIVITY (activity), NULL);
+
+	return activity->priv->icon_name;
+}
+
+void
+e_activity_set_icon_name (EActivity *activity,
+                          const gchar *icon_name)
+{
+	g_return_if_fail (E_IS_ACTIVITY (activity));
+
+	g_free (activity->priv->icon_name);
+	activity->priv->icon_name = g_strdup (icon_name);
+
+	g_object_notify (G_OBJECT (activity), "icon-name");
+}
+
+gdouble
+e_activity_get_percent (EActivity *activity)
+{
+	g_return_val_if_fail (E_IS_ACTIVITY (activity), -1.0);
+
+	return activity->priv->percent;
+}
+
+void
+e_activity_set_percent (EActivity *activity,
+                        gdouble percent)
+{
+	g_return_if_fail (E_IS_ACTIVITY (activity));
+
+	activity->priv->percent = percent;
+
+	g_object_notify (G_OBJECT (activity), "percent");
+}
+
+const gchar *
+e_activity_get_primary_text (EActivity *activity)
+{
+	g_return_val_if_fail (E_IS_ACTIVITY (activity), NULL);
+
+	return activity->priv->primary_text;
+}
+
+void
+e_activity_set_primary_text (EActivity *activity,
+                             const gchar *primary_text)
+{
+	g_return_if_fail (E_IS_ACTIVITY (activity));
+
+	g_free (activity->priv->primary_text);
+	activity->priv->primary_text = g_strdup (primary_text);
+
+	g_object_notify (G_OBJECT (activity), "primary-text");
+}
+
+const gchar *
+e_activity_get_secondary_text (EActivity *activity)
+{
+	g_return_val_if_fail (E_IS_ACTIVITY (activity), NULL);
+
+	return activity->priv->secondary_text;
+}
+
+void
+e_activity_set_secondary_text (EActivity *activity,
+                               const gchar *secondary_text)
+{
+	g_return_if_fail (E_IS_ACTIVITY (activity));
+
+	g_free (activity->priv->secondary_text);
+	activity->priv->secondary_text = g_strdup (secondary_text);
+
+	g_object_notify (G_OBJECT (activity), "secondary-text");
+}
diff --git a/widgets/misc/e-activity.h b/widgets/misc/e-activity.h
new file mode 100644
index 0000000000..b88ba58dfb
--- /dev/null
+++ b/widgets/misc/e-activity.h
@@ -0,0 +1,86 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+ * e-activity.h
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef E_ACTIVITY_H
+#define E_ACTIVITY_H
+
+#include <glib-object.h>
+
+/* Standard GObject macros */
+#define E_TYPE_ACTIVITY \
+	(e_activity_get_type ())
+#define E_ACTIVITY(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_ACTIVITY, EActivity))
+#define E_ACTIVITY_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_ACTIVITY, EActivityClass))
+#define E_IS_ACTIVITY(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_ACTIVITY))
+#define E_IS_ACTIVITY_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_ACTIVITY))
+#define E_ACTIVITY_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_ACTIVITY, EActivityClass))
+
+G_BEGIN_DECLS
+
+typedef struct _EActivity EActivity;
+typedef struct _EActivityClass EActivityClass;
+typedef struct _EActivityPrivate EActivityPrivate;
+
+struct _EActivity {
+	GObject parent;
+	EActivityPrivate *priv;
+};
+
+struct _EActivityClass {
+	GObjectClass parent_class;
+};
+
+GType		e_activity_get_type		(void);
+EActivity *	e_activity_new			(const gchar *primary_text);
+void		e_activity_cancel		(EActivity *activity);
+void		e_activity_complete		(EActivity *activity);
+gchar *		e_activity_describe		(EActivity *activity);
+gboolean	e_activity_is_cancelled		(EActivity *activity);
+gboolean	e_activity_is_completed		(EActivity *activity);
+gboolean	e_activity_get_cancellable	(EActivity *activity);
+void		e_activity_set_cancellable	(EActivity *activity,
+						 gboolean cancellable);
+const gchar *	e_activity_get_icon_name	(EActivity *activity);
+void		e_activity_set_icon_name	(EActivity *activity,
+						 const gchar *icon_name);
+gdouble		e_activity_get_percent		(EActivity *activity);
+void		e_activity_set_percent		(EActivity *activity,
+						 gdouble percent);
+const gchar *	e_activity_get_primary_text	(EActivity *activity);
+void		e_activity_set_primary_text	(EActivity *activity,
+						 const gchar *primary_text);
+const gchar *	e_activity_get_secondary_text	(EActivity *activity);
+void		e_activity_set_secondary_text	(EActivity *activity,
+						 const gchar *secondary_text);
+
+G_END_DECLS
+
+#endif /* E_ACTIVITY_H */
diff --git a/widgets/misc/e-task-widget.c b/widgets/misc/e-task-widget.c
deleted file mode 100644
index fe500ae778..0000000000
--- a/widgets/misc/e-task-widget.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-task-widget.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- * Author: Ettore Perazzoli <ettore@ximian.com>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-task-widget.h"
-#include "e-spinner.h"
-
-#include <glib/gi18n.h>
-
-
-#define SPACING 2
-
-struct _ETaskWidgetPrivate {
-	GtkWidget *label;
-	GtkWidget *box;
-	GtkWidget *image;
-
-	void (*cancel_func) (gpointer data);
-	gpointer data;
-};
-
-G_DEFINE_TYPE (ETaskWidget, e_task_widget, GTK_TYPE_EVENT_BOX)
-
-/* GObject methods.  */
-
-static void
-impl_finalize (GObject *object)
-{
-	ETaskWidget *task_widget;
-	ETaskWidgetPrivate *priv;
-
-	task_widget = E_TASK_WIDGET (object);
-	priv = task_widget->priv;
-
-	g_free (priv);
-
-	(* G_OBJECT_CLASS (e_task_widget_parent_class)->finalize) (object);
-}
-
-
-static void
-e_task_widget_class_init (ETaskWidgetClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	object_class->finalize = impl_finalize;
-}
-
-static void
-e_task_widget_init (ETaskWidget *task_widget)
-{
-	ETaskWidgetPrivate *priv;
-
-	priv = g_new (ETaskWidgetPrivate, 1);
-
-	priv->label        = NULL;
-	priv->image        = NULL;
-	priv->box	   = NULL;
-
-	task_widget->priv = priv;
-	task_widget->id = 0;
-}
-
-static gboolean
-button_press_event_cb (GtkWidget *w, gpointer data)
-{
-	ETaskWidget *tw = (ETaskWidget *) data;
-	ETaskWidgetPrivate *priv = tw->priv;
-
-	priv->cancel_func (priv->data);
-
-	return TRUE;
-}
-
-static gboolean
-prepare_popup (ETaskWidget *widget, GdkEventButton *event)
-{
-	if (event->type != GDK_BUTTON_PRESS)
-		return FALSE;
-
-	if (event->button != 3)
-		return FALSE;
-	
-	/* FIXME: Implement Cancel */
-
-	return TRUE;
-}
-
-
-void
-e_task_widget_construct (ETaskWidget *task_widget,
-			 const char *information,
-			 void (*cancel_func) (gpointer data),
-			 gpointer data)
-{
-	ETaskWidgetPrivate *priv;
-	GtkWidget *box;
-	GtkWidget *frame;
-
-	g_return_if_fail (task_widget != NULL);
-	g_return_if_fail (E_IS_TASK_WIDGET (task_widget));
-	g_return_if_fail (information != NULL);
-
-	priv = task_widget->priv;
-
-	frame = gtk_frame_new (NULL);
-	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-	gtk_container_add (GTK_CONTAINER (task_widget), frame);
-	gtk_widget_show (frame);
-
-	box = gtk_hbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (frame), box);
-	gtk_widget_show (box);
-
-	gtk_widget_set_size_request (box, 1, -1);
-
-	priv->box = gtk_hbox_new (FALSE, 0);
-	priv->image = e_spinner_new ();
-	e_spinner_set_size (E_SPINNER (priv->image), GTK_ICON_SIZE_SMALL_TOOLBAR);
-	e_spinner_start (E_SPINNER (priv->image));
-	gtk_widget_show (priv->image);
-	gtk_widget_show (priv->box);
-	gtk_box_pack_start (GTK_BOX (priv->box), priv->image, FALSE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (box), priv->box, FALSE, TRUE, 0);
-	priv->label = gtk_label_new ("");
-	gtk_misc_set_alignment (GTK_MISC (priv->label), 0.0, 0.5);
-	gtk_widget_show (priv->label);
-	gtk_box_pack_start (GTK_BOX (box), priv->label, TRUE, TRUE, 0);
-	if (cancel_func) {
-		GdkPixbuf *pixbuf;
-		GtkWidget *image;
-		GtkWidget *tool;
-
-		pixbuf = gtk_icon_theme_load_icon (
-			gtk_icon_theme_get_default (),
-			"gtk-stop", 16, 0, NULL);
-		image = gtk_image_new_from_pixbuf (pixbuf);
-		g_object_unref (pixbuf);
-
-		tool = (GtkWidget *) gtk_tool_button_new (image, NULL);
-		gtk_box_pack_end (GTK_BOX (box), tool, FALSE, TRUE, 0);
-		gtk_widget_show_all (tool);
-
-		gtk_widget_set_sensitive (tool, cancel_func != NULL);
-		priv->cancel_func = cancel_func;
-		priv->data = data;
-		g_signal_connect (tool, "clicked",  G_CALLBACK (button_press_event_cb), task_widget);
- 		g_signal_connect (task_widget, "button-press-event", G_CALLBACK (prepare_popup), task_widget);
-
-	}
-
-	e_task_widget_update (task_widget, information, -1.0);
-}
-
-GtkWidget *
-e_task_widget_new_with_cancel (const char *information,
-                               void (*cancel_func) (gpointer data),
-                               gpointer data)
-{
-	ETaskWidget *task_widget;
-
-	g_return_val_if_fail (information != NULL, NULL);
-
-	task_widget = g_object_new (e_task_widget_get_type (), NULL);
-	e_task_widget_construct (task_widget, information, cancel_func, data);
-
-	return GTK_WIDGET (task_widget);
-}
-
-GtkWidget *
-e_task_widget_new (const char *information)
-{
-	ETaskWidget *task_widget;
-
-	g_return_val_if_fail (information != NULL, NULL);
-
-	task_widget = g_object_new (e_task_widget_get_type (), NULL);
-	e_task_widget_construct (task_widget, information, NULL, NULL);
-
-	return GTK_WIDGET (task_widget);
-}
-
-GtkWidget *
-e_task_widget_update_image (ETaskWidget *task_widget,
-			    const char *stock, const char *text)
-{
-	GtkWidget *image, *tool;
-        GdkPixbuf *pixbuf;
-
-        pixbuf = gtk_icon_theme_load_icon (
-                gtk_icon_theme_get_default (),
-                stock, 16, 0, NULL);
-        image = gtk_image_new_from_pixbuf (pixbuf);
-        g_object_unref (pixbuf);
-
-	tool = (GtkWidget *) gtk_tool_button_new (image, NULL);
-	gtk_box_pack_start (GTK_BOX(task_widget->priv->box), tool, FALSE, TRUE, 0);
-	gtk_widget_show_all (task_widget->priv->box);
-	gtk_widget_hide (task_widget->priv->image);
-	task_widget->priv->image = image;
-	gtk_label_set_text (GTK_LABEL (task_widget->priv->label), text);
-
-	return tool;
-}
-
-
-void
-e_task_widget_update (ETaskWidget *task_widget,
-		      const char *information,
-		      double completion)
-{
-	ETaskWidgetPrivate *priv;
-	char *text;
-
-	g_return_if_fail (task_widget != NULL);
-	g_return_if_fail (E_IS_TASK_WIDGET (task_widget));
-	g_return_if_fail (information != NULL);
-
-	priv = task_widget->priv;
-
-	if (completion < 0.0) {
-		/* For Translator only: %s is status message that is displayed (eg "moving items", "updating objects") */
-		text = g_strdup_printf (_("%s (...)"), information);
-	} else {
-		int percent_complete;
-		percent_complete = (int) (completion * 100.0 + .5);
-		/* For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
-		   %d is a number between 0 and 100, describing the percentage of operation complete */
-		text = g_strdup_printf (_("%s (%d%% complete)"), information, percent_complete);
-	}
-
-	gtk_label_set_text (GTK_LABEL (priv->label), text);
-
-	gtk_widget_set_tooltip_text (GTK_WIDGET (task_widget), text);
-
-	g_free (text);
-}
-
-void
-e_task_wiget_alert (ETaskWidget *task_widget)
-{
-	g_return_if_fail (task_widget != NULL);
-	g_return_if_fail (E_IS_TASK_WIDGET (task_widget));
-}
-
-void
-e_task_wiget_unalert (ETaskWidget *task_widget)
-{
-	g_return_if_fail (task_widget != NULL);
-	g_return_if_fail (E_IS_TASK_WIDGET (task_widget));
-}
diff --git a/widgets/misc/e-task-widget.h b/widgets/misc/e-task-widget.h
deleted file mode 100644
index a955da4bb1..0000000000
--- a/widgets/misc/e-task-widget.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
- *
- *
- * Authors:
- *		Ettore Perazzoli <ettore@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifndef _E_TASK_WIDGET_H_
-#define _E_TASK_WIDGET_H_
-
-#include <gtk/gtk.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_TASK_WIDGET			(e_task_widget_get_type ())
-#define E_TASK_WIDGET(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_TASK_WIDGET, ETaskWidget))
-#define E_TASK_WIDGET_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_TASK_WIDGET, ETaskWidgetClass))
-#define E_IS_TASK_WIDGET(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_TASK_WIDGET))
-#define E_IS_TASK_WIDGET_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_TASK_WIDGET))
-
-
-typedef struct _ETaskWidget        ETaskWidget;
-typedef struct _ETaskWidgetPrivate ETaskWidgetPrivate;
-typedef struct _ETaskWidgetClass   ETaskWidgetClass;
-
-struct _ETaskWidget {
-	GtkEventBox parent;
-
-	ETaskWidgetPrivate *priv;
-	guint id;
-};
-
-struct _ETaskWidgetClass {
-	GtkEventBoxClass parent_class;
-};
-
-
-GType		e_task_widget_get_type		(void);
-void		e_task_widget_construct		(ETaskWidget *task_widget,
-						 const char *information,
-						 void (*cancel_func) (gpointer data),
-						 gpointer data);
-GtkWidget *	e_task_widget_new		(const char *information);
-GtkWidget *	e_task_widget_new_with_cancel	(const char *information,
-						 void (*cancel_func) (gpointer data),
-						 gpointer data);
-void		e_task_widget_update		(ETaskWidget *task_widget,
-						 const char *information,
-						 double completion);
-GtkWidget *	e_task_widget_update_image	(ETaskWidget *task_widget,
-						 const char *stock,
-						 const char *text);
-void		e_task_wiget_alert		(ETaskWidget *task_widget);
-void		e_task_wiget_unalert		(ETaskWidget *task_widget);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_TASK_WIDGET_H_ */