[evolution-data-server] sync_folders: Return FALSE on error.



commit c06be98c605b95b1096d5b2ec03a497b81114cc8
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Aug 14 22:06:31 2013 -0400

    sync_folders: Return FALSE on error.

 camel/camel-imapx-store.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/camel/camel-imapx-store.c b/camel/camel-imapx-store.c
index 118fe08..9656ac4 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 (


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]