[evolution-data-server/gnome-3-22] Bug 772095 - Don't check available sources for disabled accounts (Google/ownCloud)

[Milan Crha <mcrha src gnome org>]

commit a9159f7294ba7564efb14d0c5c7761a5a17b40e7
Author: Milan Crha <mcrha redhat com>
Date:   Wed Oct 12 18:48:15 2016 +0200

    Bug 772095 - Don't check available sources for disabled accounts (Google/ownCloud)

 modules/google-backend/module-google-backend.c     |    2 +-
 modules/owncloud-backend/module-owncloud-backend.c |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/modules/google-backend/module-google-backend.c b/modules/google-backend/module-google-backend.c
index 2e52742..d17d76c 100644
--- a/modules/google-backend/module-google-backend.c
+++ b/modules/google-backend/module-google-backend.c
@@ -754,7 +754,7 @@ google_backend_populate (ECollectionBackend *backend)
        /* Chain up to parent's populate() method. */
        E_COLLECTION_BACKEND_CLASS (e_google_backend_parent_class)->populate (backend);
 
-       if (e_source_collection_get_calendar_enabled (collection_extension)) {
+       if (e_source_get_enabled (source) && e_source_collection_get_calendar_enabled (collection_extension)) 
{
                e_backend_schedule_credentials_required (E_BACKEND (backend),
                        E_SOURCE_CREDENTIALS_REASON_REQUIRED, NULL, 0, NULL, NULL, G_STRFUNC);
        }
diff --git a/modules/owncloud-backend/module-owncloud-backend.c 
b/modules/owncloud-backend/module-owncloud-backend.c
index 238cd7e..f825835 100644
--- a/modules/owncloud-backend/module-owncloud-backend.c
+++ b/modules/owncloud-backend/module-owncloud-backend.c
@@ -441,8 +441,9 @@ owncloud_backend_populate (ECollectionBackend *collection)
        source = e_backend_get_source (E_BACKEND (collection));
        collection_extension = e_source_get_extension (source, E_SOURCE_EXTENSION_COLLECTION);
 
-       if (e_source_collection_get_calendar_enabled (collection_extension) ||
-           e_source_collection_get_contacts_enabled (collection_extension)) {
+       if (e_source_get_enabled (source) && (
+           e_source_collection_get_calendar_enabled (collection_extension) ||
+           e_source_collection_get_contacts_enabled (collection_extension))) {
                e_backend_schedule_credentials_required (E_BACKEND (collection),
                        E_SOURCE_CREDENTIALS_REASON_REQUIRED, NULL, 0, NULL, NULL, G_STRFUNC);
        }