summaryrefslogtreecommitdiff
path: root/camel/camel-imapx-store.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-08-14 22:06:31 -0400
committerMatthew Barnes <mbarnes@redhat.com>2013-08-15 05:47:56 -0400
commitc06be98c605b95b1096d5b2ec03a497b81114cc8 (patch)
treea21a2ba63b89d1c36671f9c16838859293960ce5 /camel/camel-imapx-store.c
parent14ee141f8dfbd250ebaf0b4bfd03cf5bd9dc67f6 (diff)
downloadevolution-data-server-c06be98c605b95b1096d5b2ec03a497b81114cc8.tar.gz
sync_folders: Return FALSE on error.
Diffstat (limited to 'camel/camel-imapx-store.c')
-rw-r--r--camel/camel-imapx-store.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/camel/camel-imapx-store.c b/camel/camel-imapx-store.c
index 118fe08f8..9656ac4ff 100644
--- a/camel/camel-imapx-store.c
+++ b/camel/camel-imapx-store.c
@@ -1286,18 +1286,14 @@ sync_folders (CamelIMAPXStore *imapx_store,
GHashTable *folders_from_server;
gboolean notify_all;
gint ii, total;
- GError *local_error = NULL;
store_summary = CAMEL_STORE_SUMMARY (imapx_store->summary);
folders_from_server = fetch_folders_for_namespaces (
- imapx_store, pattern, sync, cancellable, &local_error);
+ imapx_store, pattern, sync, cancellable, error);
- /* Sanity check. */
- g_return_val_if_fail (
- ((folders_from_server != NULL) && (local_error == NULL)) ||
- ((folders_from_server == NULL) && (local_error != NULL)),
- FALSE);
+ if (folders_from_server == NULL)
+ return FALSE;
settings = camel_service_ref_settings (CAMEL_SERVICE (imapx_store));
notify_all = !camel_imapx_settings_get_use_subscriptions (