[evolution/gnome-3-10] Fix error handling glitch in mail_session_send_to_thread().



commit e2599542163140b827a73881cfa44f8b5d3863b3
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Oct 29 09:28:17 2013 -0400

    Fix error handling glitch in mail_session_send_to_thread().
    
    If sending a message fails but the user was already connected to the
    MTA, the error is missed and not handled until further into the logic,
    where it's treated as though sending succeeded and only post-processing
    failed.  This results in the user seeing a copy of the message in Sent,
    but the message was never actually sent.
    
    Fallout from the investigation of bug 710807.
    
    (cherry picked from commit d3e0f96c73dde49acde92f6347b9e362d85e94aa)

 libemail-engine/e-mail-session-utils.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/libemail-engine/e-mail-session-utils.c b/libemail-engine/e-mail-session-utils.c
index 6402e26..8732f2a 100644
--- a/libemail-engine/e-mail-session-utils.c
+++ b/libemail-engine/e-mail-session-utils.c
@@ -578,11 +578,11 @@ mail_session_send_to_thread (GSimpleAsyncResult *simple,
                        camel_service_disconnect_sync (
                                context->transport, TRUE, cancellable, &error);
                }
+       }
 
-               if (error != NULL) {
-                       g_simple_async_result_take_error (simple, error);
-                       return;
-               }
+       if (error != NULL) {
+               g_simple_async_result_take_error (simple, error);
+               return;
        }
 
 skip_send:


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