Simplify EActivity.

With unintrusive error dialogs gone, we can cut some unnecessary bits
out of EActivity.

I'm also adding a new enum property called "state", which is one of:

    E_ACTIVITY_RUNNING
    E_ACTIVITY_WAITING
    E_ACTIVITY_CANCELLED
    E_ACTIVITY_COMPLETED

The state of an activity must be explicitly changed.  In particular,
when the user cancels an activity the state should be set only after
confirming the operation has been cancelled and not when cancellation
is requested (e.g. after receiving a G_IO_ERROR_CANCELLED, not when
the GCancellable emits "cancelled").  EActivityBar and EActivityProxy
widgets have been updated to make this distinction clearer in the UI.

E_ACTIVITY_WAITING will be used when activities have to be queued and
dispatched in sequence, which I haven't written yet.

1 files changed, 0 insertions, 18 deletions

diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index a30a48263b..34cf70597a 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -3533,11 +3533,9 @@ void
 e_msg_composer_send (EMsgComposer *composer)
 {
 	AsyncContext *context;
-	GtkAction *action;
 	EActivityBar *activity_bar;
 	GCancellable *cancellable;
 	gboolean proceed_with_send = TRUE;
-	const gchar *icon_name;
 
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 
@@ -3554,10 +3552,6 @@ e_msg_composer_send (EMsgComposer *composer)
 	e_activity_set_cancellable (context->activity, cancellable);
 	g_object_unref (cancellable);
 
-	action = ACTION (SEND);
-	icon_name = gtk_action_get_icon_name (action);
-	e_activity_set_icon_name (context->activity, icon_name);
-
 	activity_bar = E_ACTIVITY_BAR (composer->priv->activity_bar);
 	e_activity_bar_set_activity (activity_bar, context->activity);
 
@@ -3623,10 +3617,8 @@ void
 e_msg_composer_save_draft (EMsgComposer *composer)
 {
 	AsyncContext *context;
-	GtkAction *action;
 	EActivityBar *activity_bar;
 	GCancellable *cancellable;
-	const gchar *icon_name;
 
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 
@@ -3637,10 +3629,6 @@ e_msg_composer_save_draft (EMsgComposer *composer)
 	e_activity_set_cancellable (context->activity, cancellable);
 	g_object_unref (cancellable);
 
-	action = ACTION (SAVE_DRAFT);
-	icon_name = gtk_action_get_icon_name (action);
-	e_activity_set_icon_name (context->activity, icon_name);
-
 	activity_bar = E_ACTIVITY_BAR (composer->priv->activity_bar);
 	e_activity_bar_set_activity (activity_bar, context->activity);
 
@@ -3703,10 +3691,8 @@ e_msg_composer_print (EMsgComposer *composer,
                       GtkPrintOperationAction print_action)
 {
 	AsyncContext *context;
-	GtkAction *action;
 	EActivityBar *activity_bar;
 	GCancellable *cancellable;
-	const gchar *icon_name;
 
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 
@@ -3718,10 +3704,6 @@ e_msg_composer_print (EMsgComposer *composer,
 	e_activity_set_cancellable (context->activity, cancellable);
 	g_object_unref (cancellable);
 
-	action = ACTION (PRINT);
-	icon_name = gtk_action_get_icon_name (action);
-	e_activity_set_icon_name (context->activity, icon_name);
-
 	activity_bar = E_ACTIVITY_BAR (composer->priv->activity_bar);
 	e_activity_bar_set_activity (activity_bar, context->activity);