1 files changed, 288 insertions, 12 deletions

diff --git a/widgets/misc/e-activity-handler.c b/widgets/misc/e-activity-handler.c
index b9351878a6..305d2cc5f3 100644
--- a/widgets/misc/e-activity-handler.c
+++ b/widgets/misc/e-activity-handler.c
@@ -45,6 +45,10 @@ struct _ActivityInfo {
 	gboolean cancellable;
 	double progress;
 	GtkWidget *menu;
+	void (*cancel_func) (gpointer data);
+	gpointer data;
+	gpointer error;
+	time_t	error_time;
 };
 typedef struct _ActivityInfo ActivityInfo;
 
@@ -52,12 +56,18 @@ struct _EActivityHandlerPrivate {
 	guint next_activity_id;
 	GList *activity_infos;
 	GSList *task_bars;
+	ELogger *logger;
+	guint error_timer;
+	guint error_flush_interval;
+
 };
 
 G_DEFINE_TYPE (EActivityHandler, e_activity_handler, G_TYPE_OBJECT)
 
 /* Utility functions.  */
 
+static void handle_error (ETaskWidget *task);
+
 static unsigned int
 get_new_activity_id (EActivityHandler *activity_handler)
 {
@@ -126,12 +136,14 @@ activity_info_new (const char *component_id,
 	info = g_new (ActivityInfo, 1);
 	info->component_id   = g_strdup (component_id);
 	info->id             = id;
-	info->icon_pixbuf    = g_object_ref (icon);
+	info->icon_pixbuf    = icon ? g_object_ref (icon): NULL;
 	info->information    = g_strdup (information);
 	info->cancellable    = cancellable;
 	info->progress       = -1.0; /* (Unknown) */
 	info->menu           = NULL;
-
+	info->error          = NULL;
+	info->cancel_func    = NULL;
+	
 	return info;
 }
 
@@ -140,7 +152,8 @@ activity_info_free (ActivityInfo *info)
 {
 	g_free (info->component_id);
 
-	g_object_unref (info->icon_pixbuf);
+	if (info->icon_pixbuf)
+		g_object_unref (info->icon_pixbuf);
 	g_free (info->information);
 
 	if (info->menu != NULL)
@@ -153,10 +166,13 @@ static ETaskWidget *
 task_widget_new_from_activity_info (ActivityInfo *activity_info)
 {
 	GtkWidget *widget;
+	ETaskWidget *etw;
 
-	widget = e_task_widget_new (activity_info->icon_pixbuf,
+	widget = e_task_widget_new_with_cancel (activity_info->icon_pixbuf,
 				    activity_info->component_id,
-				    activity_info->information);
+				    activity_info->information, activity_info->cancel_func, activity_info->data);
+	etw = (ETaskWidget *) widget;
+	etw->id = activity_info->id;
 	gtk_widget_show (widget);
 
 	g_signal_connect (widget, "button_press_event",
@@ -179,8 +195,21 @@ setup_task_bar (EActivityHandler *activity_handler,
 	priv = activity_handler->priv;
 
 	for (p = g_list_last (priv->activity_infos); p != NULL; p = p->prev) {
-		e_task_bar_prepend_task (task_bar,
-					 task_widget_new_from_activity_info ((ActivityInfo *) p->data));
+		ActivityInfo *info = p->data;
+		ETaskWidget *task_widget = task_widget_new_from_activity_info (info);
+		task_widget->id = info->id;
+		e_task_bar_prepend_task (task_bar, task_widget);
+		if (info->error) {
+			/* Prepare to handle existing errors*/
+			GtkWidget *tool;
+
+			tool = e_task_widget_update_image (task_widget, "stock_dialog-warning", g_object_get_data (info->error, "error"));
+			g_object_set_data ((GObject *) task_widget, "tool", tool);
+			g_object_set_data ((GObject *) task_widget, "error", info->error);
+			g_object_set_data ((GObject *) task_widget, "activity-handler", activity_handler);
+			g_object_set_data ((GObject *) task_widget, "activity", GINT_TO_POINTER(info->id));
+			g_signal_connect_swapped (tool, "clicked", G_CALLBACK(handle_error), task_widget);			
+		}
 	}
 }
 
@@ -260,7 +289,9 @@ e_activity_handler_init (EActivityHandler *activity_handler)
 	priv->next_activity_id = 1;
 	priv->activity_infos   = NULL;
 	priv->task_bars        = NULL;
-
+	priv->logger 	       = NULL;
+	priv->error_timer      = 0;
+	priv->error_flush_interval = 0;
 	activity_handler->priv = priv;
 }
 
@@ -272,6 +303,17 @@ e_activity_handler_new (void)
 }
 
 void
+e_activity_handler_set_error_flush_time (EActivityHandler *handler, int time)
+{
+	handler->priv->error_flush_interval = time;
+}
+void
+e_activity_handler_set_logger (EActivityHandler *handler, ELogger *logger)
+{
+	handler->priv->logger = logger;
+}
+
+void
 e_activity_handler_set_message (EActivityHandler *activity_handler,
 				const char       *message)
 {
@@ -316,7 +358,93 @@ e_activity_handler_attach_task_bar (EActivityHandler *activity_handler,
 	setup_task_bar (activity_handler, task_bar);
 }
 
+struct _cancel_wdata {
+	EActivityHandler *handler;	
+	ActivityInfo *info;
+	guint id;
+	void (*cancel)(gpointer);
+	gpointer data;
+};
+
+static void 
+cancel_wrapper (gpointer pdata)
+{
+	struct _cancel_wdata *data = (struct _cancel_wdata *) pdata;
+	/* This can be invoked in two scenario. Either to cancel or to hide error */
+	if (data->info->error) {
+		/* Hide the error */
+		EActivityHandler *handler = data->handler;
+		int order, len;
+		GSList *sp;
+		GList *p = lookup_activity (handler->priv->activity_infos, data->id, &order);
+		e_logger_log (handler->priv->logger, E_LOG_ERROR, g_object_get_data (data->info->error, "primary"), 
+						    g_object_get_data (data->info->error, "secondary"));
+		gtk_widget_destroy (data->info->error);
+		printf("%p %p %d\n", data->info->error, data->info, data->info->id);
+		data->info->error = NULL;
+		for (sp = handler->priv->task_bars; sp != NULL; sp = sp->next) {
+			ETaskBar *task_bar;
+
+			task_bar = E_TASK_BAR (sp->data);
+			e_task_bar_remove_task_from_id (task_bar, data->info->id);	
+		}
+		activity_info_free (data->info);
+		len = g_list_length (handler->priv->activity_infos);
+		handler->priv->activity_infos = g_list_remove_link (handler->priv->activity_infos, p);
+		if (len == 1)
+			handler->priv->activity_infos = NULL;
+	} else {
+		/* Cancel the operation */
+		data->cancel (data->data);
+	}
+	/* No need to free the data. It will be freed as part of the task widget destroy */
+}
+
 /* CORBA methods.  */
+guint  e_activity_handler_cancelable_operation_started  (EActivityHandler *activity_handler,
+						      const char       *component_id,
+						      GdkPixbuf        *icon_pixbuf,
+					      	      const char       *information,
+					      	      gboolean          cancellable,
+						      void (*cancel_func)(gpointer),
+						      gpointer user_data)
+{
+	EActivityHandlerPrivate *priv;
+	ActivityInfo *activity_info;
+	unsigned int activity_id;
+	GSList *p;
+	struct _cancel_wdata *data;
+	gboolean bfree = FALSE;
+	priv = activity_handler->priv;
+
+	activity_id = get_new_activity_id (activity_handler);
+	activity_info = activity_info_new (component_id, activity_id, icon_pixbuf, information, cancellable);
+
+	data = g_new(struct _cancel_wdata, 1);
+	data->handler = activity_handler;
+	data->id = activity_id;
+	data->info = activity_info;
+	data->cancel = cancel_func;
+	data->data = user_data;
+
+	activity_info->cancel_func = cancel_wrapper;
+	activity_info->data = data;
+	for (p = priv->task_bars; p != NULL; p = p->next) {
+		ETaskWidget *tw = task_widget_new_from_activity_info (activity_info);
+		tw->id = activity_id;
+		if (!bfree) {
+			/* The data will be freed part of the widget destroy */
+			g_object_set_data_full ((GObject *) tw, "free-data", data, g_free);
+			bfree = TRUE;
+		}
+		e_task_bar_prepend_task (E_TASK_BAR (p->data), tw);
+	}
+
+	priv->activity_infos = g_list_prepend (priv->activity_infos, activity_info);
+
+	return activity_id;
+
+}
 
 guint
 e_activity_handler_operation_started (EActivityHandler *activity_handler,
@@ -337,16 +465,162 @@ e_activity_handler_operation_started (EActivityHandler *activity_handler,
 	activity_info = activity_info_new (component_id, activity_id, icon_pixbuf, information, cancellable);
 
 	for (p = priv->task_bars; p != NULL; p = p->next) {
-		e_task_bar_prepend_task (E_TASK_BAR (p->data),
-					 task_widget_new_from_activity_info (activity_info));
+		ETaskWidget *tw = task_widget_new_from_activity_info (activity_info);
+		tw->id = activity_id;
+		e_task_bar_prepend_task (E_TASK_BAR (p->data), tw);
+	}
+
+	priv->activity_infos = g_list_prepend (priv->activity_infos, activity_info);
+
+	return activity_id;
+}
+
+static void
+handle_error (ETaskWidget *task)
+{
+	GtkWidget *tool, *error;
+	EActivityHandler *activity_handler;
+	guint id;
+	
+	tool = g_object_get_data ((GObject *) task, "tool");
+	error = g_object_get_data ((GObject *) task, "error");
+	activity_handler = g_object_get_data ((GObject *) task, "activity-handler");
+	id = GPOINTER_TO_UINT (g_object_get_data ((GObject *) task, "activity"));
+	e_activity_handler_operation_finished (activity_handler, id);
+	gtk_widget_show (error);
+	e_logger_log (activity_handler->priv->logger, E_LOG_ERROR, g_object_get_data ((GObject *) error, "primary"), 
+				    g_object_get_data ((GObject *) error, "secondary"));
+}
+
+static gboolean
+error_cleanup (EActivityHandler *activity_handler)
+{
+	EActivityHandlerPrivate *priv = activity_handler->priv;
+	GList *p, *node;
+	GSList *sp;
+	int i;
+	time_t now = time (NULL);
+	gboolean berror = FALSE;
+
+	for (p = priv->activity_infos, i = 0; p != NULL; i++) {
+		ActivityInfo *info;
+
+		info = (ActivityInfo *) p->data;
+		if (info->error)
+			berror = TRUE;
+		if (info->error && info->error_time && (now - info->error_time) > 5 ) {
+			/* Error older than wanted time. So cleanup */
+			e_logger_log (priv->logger, E_LOG_ERROR, g_object_get_data (info->error, "primary"), 
+						    g_object_get_data (info->error, "secondary"));
+			gtk_widget_destroy (info->error);
+			node = p;
+			p = p->next;
+
+			for (sp = priv->task_bars; sp != NULL; sp = sp->next) {
+				ETaskBar *task_bar;
+
+				task_bar = E_TASK_BAR (sp->data);
+				e_task_bar_remove_task_from_id (task_bar, info->id);
+			}
+			activity_info_free (info);
+			priv->activity_infos = g_list_remove_link (priv->activity_infos, node);
+		
+		} else
+			p = p->next;
+	}
+	if (!berror)
+		priv->error_timer = 0;
+	return berror;
+}
+
+guint
+e_activity_handler_make_error (EActivityHandler *activity_handler,
+				      const char *component_id,
+				      const char *information,
+				      GtkWidget  *error)
+{
+	EActivityHandlerPrivate *priv;
+	ActivityInfo *activity_info;
+	unsigned int activity_id;
+	GSList *p;
+
+	priv = activity_handler->priv;
+
+	activity_id = get_new_activity_id (activity_handler);
+
+	activity_info = activity_info_new (component_id, activity_id, NULL, information, TRUE);
+	activity_info->error = error;
+	activity_info->error_time = time (NULL);
+
+	for (p = priv->task_bars; p != NULL; p = p->next) {
+		ETaskBar *task_bar;
+		ETaskWidget *task_widget;
+		GtkWidget *tool;
+
+		task_bar = E_TASK_BAR (p->data);
+		task_widget = task_widget_new_from_activity_info (activity_info); 
+		task_widget->id = activity_id;
+		e_task_bar_prepend_task (E_TASK_BAR (p->data), task_widget);
+		
+		tool = e_task_widget_update_image (task_widget, "stock_dialog-warning", g_object_get_data ((GObject *) error, "primary"));
+		g_object_set_data ((GObject *) task_widget, "tool", tool);
+		g_object_set_data ((GObject *) task_widget, "error", error);
+		g_object_set_data ((GObject *) task_widget, "activity-handler", activity_handler);
+		g_object_set_data ((GObject *) task_widget, "activity", GINT_TO_POINTER(activity_id));
+		g_signal_connect_swapped (tool, "clicked", G_CALLBACK(handle_error), task_widget);		
 	}
 
 	priv->activity_infos = g_list_prepend (priv->activity_infos, activity_info);
 
+	if (!activity_handler->priv->error_timer)
+		activity_handler->priv->error_timer = g_timeout_add (activity_handler->priv->error_flush_interval, (GSourceFunc)error_cleanup, activity_handler);
+
 	return activity_id;
 }
 
 void
+e_activity_handler_operation_set_error(EActivityHandler *activity_handler,
+					  guint activity_id,
+					  GtkWidget *error)
+{
+	EActivityHandlerPrivate *priv = activity_handler->priv;
+	ActivityInfo *activity_info;
+	GList *p;
+	GSList *sp;
+	int order_number;
+
+	p = lookup_activity (priv->activity_infos, activity_id, &order_number);
+	if (p == NULL) {
+		g_warning ("EActivityHandler: unknown operation %d", activity_id);
+		return;
+	}
+
+	activity_info = (ActivityInfo *) p->data;
+	activity_info->error = error;
+	activity_info->error_time = time (NULL);
+	for (sp = priv->task_bars; sp != NULL; sp = sp->next) {
+		ETaskBar *task_bar;
+		ETaskWidget *task_widget;
+		GtkWidget *tool;
+
+		task_bar = E_TASK_BAR (sp->data);
+		task_widget = e_task_bar_get_task_widget_from_id (task_bar, activity_info->id);
+		if (!task_widget)
+			continue;
+
+		tool = e_task_widget_update_image (task_widget, "stock_dialog-warning", g_object_get_data ((GObject *) error, "primary"));
+		g_object_set_data ((GObject *) task_widget, "tool", tool);
+		g_object_set_data ((GObject *) task_widget, "error", error);
+		g_object_set_data ((GObject *) task_widget, "activity-handler", activity_handler);
+		g_object_set_data ((GObject *) task_widget, "activity", GINT_TO_POINTER(activity_id));
+		g_signal_connect_swapped (tool, "clicked", G_CALLBACK(handle_error), task_widget);
+	}
+
+	if (!activity_handler->priv->error_timer)
+		activity_handler->priv->error_timer = g_timeout_add (activity_handler->priv->error_flush_interval, (GSourceFunc) error_cleanup, activity_handler);
+}
+
+void
 e_activity_handler_operation_progressing (EActivityHandler *activity_handler,
 					  guint activity_id,
 					  const char *information,
@@ -376,7 +650,9 @@ e_activity_handler_operation_progressing (EActivityHandler *activity_handler,
 		ETaskWidget *task_widget;
 
 		task_bar = E_TASK_BAR (sp->data);
-		task_widget = e_task_bar_get_task_widget (task_bar, order_number);
+		task_widget = e_task_bar_get_task_widget_from_id (task_bar, activity_info->id);
+		if (!task_widget)
+			continue;
 
 		e_task_widget_update (task_widget, information, progress);
 	}
@@ -404,7 +680,7 @@ e_activity_handler_operation_finished (EActivityHandler *activity_handler,
 		ETaskBar *task_bar;
 
 		task_bar = E_TASK_BAR (sp->data);
-		e_task_bar_remove_task (task_bar, order_number);
+		e_task_bar_remove_task_from_id (task_bar, activity_id);
 	}
 }