[evolution/gnome-3-6] MailFolderCache: Silently ignore cancellation errors.

[Matthew Barnes <mbarnes src gnome org>]

commit 285d428c069f512b828f12589d53bc3d2e00e60c
Author: Matthew Barnes <mbarnes redhat com>
Date:   Thu Oct 18 08:36:50 2012 -0400

    MailFolderCache: Silently ignore cancellation errors.
    
    (cherry picked from commit b0efa5cb274240e3d4c80c2d854dc8cbaa876b6b)

 libemail-engine/mail-folder-cache.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/libemail-engine/mail-folder-cache.c b/libemail-engine/mail-folder-cache.c
index 92aebbf..5561bb6 100644
--- a/libemail-engine/mail-folder-cache.c
+++ b/libemail-engine/mail-folder-cache.c
@@ -826,7 +826,11 @@ update_folders (CamelStore *store,
 
 	fi = camel_store_get_folder_info_finish (store, result, &error);
 
-	if (error != NULL) {
+	/* Silently ignore cancellation errors. */
+	if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+		g_error_free (error);
+
+	} else if (error != NULL) {
 		g_warning ("%s", error->message);
 		g_error_free (error);
 	}