[evolution-data-server/evolution-data-server-3-12] Bug 738724 - [IMAP] Message flag changes not always saved

[Milan Crha <mcrha src gnome org>]

commit c02bfefe96dcdfd82a4d99cde55b0846a7d4adeb
Author: Milan Crha <mcrha redhat com>
Date:   Mon Nov 3 13:56:22 2014 +0100

    Bug 738724 - [IMAP] Message flag changes not always saved

 camel/camel-store.c                        |    3 +++
 camel/providers/imapx/camel-imapx-server.c |   10 ----------
 2 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/camel/camel-store.c b/camel/camel-store.c
index 449b161..5906c17 100644
--- a/camel/camel-store.c
+++ b/camel/camel-store.c
@@ -479,6 +479,9 @@ store_synchronize_sync (CamelStore *store,
        for (ii = 0; ii < folders->len; ii++) {
                CamelFolder *folder = folders->pdata[ii];
 
+               if (folder->summary)
+                       camel_folder_summary_save_to_db (folder->summary, NULL);
+
                if (!CAMEL_IS_VEE_FOLDER (folder) && local_error == NULL) {
                        camel_folder_synchronize_sync (
                                folder, expunge, cancellable, &local_error);
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index 4bedc67..b64c7b8 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -4558,16 +4558,6 @@ connected:
        while (1) {
                GInputStream *input_stream;
 
-               // poll ? wait for other stuff? loop?
-               if (camel_application_is_exiting) {
-                       g_set_error (
-                               error, G_IO_ERROR,
-                               G_IO_ERROR_CANCELLED,
-                               "Connection to server cancelled\n");
-                       success = FALSE;
-                       goto exit;
-               }
-
                input_stream = camel_imapx_server_ref_input_stream (is);
 
                tok = camel_imapx_input_stream_token (