[evolution] Change activity description when storing sent message



commit 827dfed56d901a2cab0d409905e8d6f93bf070d9
Author: Milan Crha <mcrha redhat com>
Date:   Mon Oct 20 10:47:40 2014 +0200

    Change activity description when storing sent message
    
    The composer/activity showed "Sending message" even when the sent
    message had been saving into a configured Sent folder. Changing
    the activity description will give a better clue what is happening
    in the background.

 libemail-engine/e-mail-session-utils.c |   15 ++++++++++++++-
 libemail-engine/mail-ops.c             |   16 +++++++++++++++-
 2 files changed, 29 insertions(+), 2 deletions(-)
---
diff --git a/libemail-engine/e-mail-session-utils.c b/libemail-engine/e-mail-session-utils.c
index cd5dd50..29781a7 100644
--- a/libemail-engine/e-mail-session-utils.c
+++ b/libemail-engine/e-mail-session-utils.c
@@ -623,10 +623,14 @@ skip_send:
 
                g_return_if_fail (CAMEL_IS_FOLDER (folder));
 
+               camel_operation_push_message (cancellable, _("Posting message to '%s'"), 
camel_folder_get_full_name (folder));
+
                camel_folder_append_message_sync (
                        folder, context->message, context->info,
                        NULL, cancellable, &error);
 
+               camel_operation_pop_message (cancellable);
+
                g_object_unref (folder);
 
                if (error != NULL) {
@@ -685,11 +689,16 @@ skip_send:
                ((folder == NULL) && (error != NULL)));
 
        /* Append the message. */
-       if (folder != NULL)
+       if (folder != NULL) {
+               camel_operation_push_message (cancellable, _("Storing sent message to '%s'"), 
camel_folder_get_full_name (folder));
+
                camel_folder_append_message_sync (
                        folder, context->message,
                        context->info, NULL, cancellable, &error);
 
+               camel_operation_pop_message (cancellable);
+       }
+
        if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
                goto exit;
 
@@ -716,9 +725,13 @@ skip_send:
 
                g_clear_error (&error);
 
+               camel_operation_push_message (cancellable, _("Storing sent message to '%s'"), 
camel_folder_get_full_name (local_sent_folder));
+
                camel_folder_append_message_sync (
                        local_sent_folder, context->message,
                        context->info, NULL, cancellable, &error);
+
+               camel_operation_pop_message (cancellable);
        }
 
        if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
diff --git a/libemail-engine/mail-ops.c b/libemail-engine/mail-ops.c
index c7bea63..a2b3bf1 100644
--- a/libemail-engine/mail-ops.c
+++ b/libemail-engine/mail-ops.c
@@ -696,8 +696,13 @@ mail_send_message (struct _send_queue_msg *m,
                folder = e_mail_session_uri_to_folder_sync (
                        m->session, uri, 0, cancellable, &local_error);
                if (folder != NULL) {
+                       camel_operation_push_message (cancellable, _("Posting message to '%s'"), 
camel_folder_get_full_name (folder));
+
                        camel_folder_append_message_sync (
                                folder, message, info, NULL, cancellable, &local_error);
+
+                       camel_operation_pop_message (cancellable);
+
                        g_object_unref (folder);
                        folder = NULL;
                }
@@ -750,11 +755,16 @@ mail_send_message (struct _send_queue_msg *m,
                        ((folder == NULL) && (local_error != NULL)) ||
                        ((folder != NULL) && (local_error == NULL)));
 
-               if (local_error == NULL)
+               if (local_error == NULL) {
+                       camel_operation_push_message (cancellable, _("Storing sent message to '%s'"), 
camel_folder_get_full_name (folder));
+
                        camel_folder_append_message_sync (
                                folder, message, info, NULL,
                                cancellable, &local_error);
 
+                       camel_operation_pop_message (cancellable);
+               }
+
                if (g_error_matches (
                        local_error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
                        goto exit;
@@ -781,10 +791,14 @@ mail_send_message (struct _send_queue_msg *m,
                        g_clear_error (&local_error);
                        folder = g_object_ref (local_sent_folder);
 
+                       camel_operation_push_message (cancellable, _("Storing sent message to '%s'"), 
camel_folder_get_full_name (folder));
+
                        camel_folder_append_message_sync (
                                folder, message, info, NULL,
                                cancellable, &local_error);
 
+                       camel_operation_pop_message (cancellable);
+
                        if (g_error_matches (
                                local_error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
                                goto exit;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]