[evolution/evolution-3-12] Bug 719379 - Send/Receive dialog doesn't close on errors properly

[Milan Crha <mcrha src gnome org>]

commit aab5e63dfa210e63aa48fd76f38c555b9374e9ab
Author: Milan Crha <mcrha redhat com>
Date:   Tue Jun 24 11:44:06 2014 +0200

    Bug 719379 - Send/Receive dialog doesn't close on errors properly

 mail/mail-send-recv.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index a04c3a5..5fe6c26 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -1114,15 +1114,19 @@ receive_update_got_folderinfo (GObject *source_object,
 
        /* Ignore cancellations. */
        if (g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
-               g_warn_if_fail (info != NULL);
+               g_warn_if_fail (info == NULL);
                g_error_free (local_error);
 
+               receive_done (send_info);
+
        /* XXX Need to hand this off to an EAlertSink. */
        } else if (local_error != NULL) {
-               g_warn_if_fail (info != NULL);
+               g_warn_if_fail (info == NULL);
                g_warning ("%s: %s", G_STRFUNC, local_error->message);
                g_error_free (local_error);
 
+               receive_done (send_info);
+
        /* CamelFolderInfo may be NULL even if no error occurred. */
        } else if (info != NULL) {
                GPtrArray *folders = g_ptr_array_new ();