aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2012-10-18 20:36:50 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-10-18 20:38:48 +0800
commit285d428c069f512b828f12589d53bc3d2e00e60c (patch)
treec35933beba3bf89062dacb6880fb5498d050cd61
parentebc86adc4f30f126eae7742df454a6b2a1aac47c (diff)
downloadgsoc2013-evolution-285d428c069f512b828f12589d53bc3d2e00e60c.tar.gz
gsoc2013-evolution-285d428c069f512b828f12589d53bc3d2e00e60c.tar.zst
gsoc2013-evolution-285d428c069f512b828f12589d53bc3d2e00e60c.zip
MailFolderCache: Silently ignore cancellation errors.
(cherry picked from commit b0efa5cb274240e3d4c80c2d854dc8cbaa876b6b)
-rw-r--r--libemail-engine/mail-folder-cache.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libemail-engine/mail-folder-cache.c b/libemail-engine/mail-folder-cache.c
index 92aebbf777..5561bb65f9 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);
}