[evolution-data-server/gnome-3-8] Bug 696285 - ownCloud: Check addressbook even if calendar fails

[Vadim Rutkovsky <vrutkovsky src gnome org>]

commit 7cee41f44e58730e37ce79807502b1523fbc89ae
Author: Vadim Rutkovsky <vrutkovs redhat com>
Date:   Mon Mar 25 14:05:44 2013 +0100

    Bug 696285 - ownCloud: Check addressbook even if calendar fails

 modules/owncloud-backend/owncloud-utils.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/modules/owncloud-backend/owncloud-utils.c b/modules/owncloud-backend/owncloud-utils.c
index 2e74f05..d6abe13 100644
--- a/modules/owncloud-backend/owncloud-utils.c
+++ b/modules/owncloud-backend/owncloud-utils.c
@@ -634,7 +634,8 @@ owncloud_utils_search_server (ECollectionBackend *collection,
        ESource *source;
        EOwncloudAuthenticator *authenticator;
        gchar *url;
-       gboolean res = TRUE;
+       gboolean res_calendars = FALSE;
+       gboolean res_contacts = FALSE;
 
        g_return_val_if_fail (collection != NULL, FALSE);
        g_return_val_if_fail (found_cb != NULL, FALSE);
@@ -647,22 +648,22 @@ owncloud_utils_search_server (ECollectionBackend *collection,
        authenticator->collection = collection;
        authenticator->username = e_source_collection_dup_identity (collection_extension);
 
-       if (res && e_source_collection_get_calendar_enabled (collection_extension)) {
+       if (e_source_collection_get_calendar_enabled (collection_extension)) {
                url = e_source_goa_dup_calendar_url (goa_extension);
 
                if (url && *url)
-                       res = find_sources (
+                       res_calendars = find_sources (
                                collection, found_cb, user_data,
                                url, "calendars", authenticator);
 
                g_free (url);
        }
 
-       if (res && e_source_collection_get_contacts_enabled (collection_extension)) {
+       if (e_source_collection_get_contacts_enabled (collection_extension)) {
                url = e_source_goa_dup_contacts_url (goa_extension);
 
                if (url && *url)
-                       res = find_sources (
+                       res_contacts = find_sources (
                                collection, found_cb, user_data,
                                url, "addressbooks", authenticator);
 
@@ -671,5 +672,5 @@ owncloud_utils_search_server (ECollectionBackend *collection,
 
        g_object_unref (authenticator);
 
-       return res;
+       return res_calendars || res_contacts;
 }