[evolution-data-server] I#228 - Restarting evolution-source-registry re-enables user-disabled CalDAV accounts

[Milan Crha <mcrha src gnome org>]

commit 2e217ba543b643a15df52b2c6a68c3145c052e1e
Author: Milan Crha <mcrha redhat com>
Date:   Fri Jun 26 12:34:47 2020 +0200

    I#228 - Restarting evolution-source-registry re-enables user-disabled CalDAV accounts
    
    Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/228

 src/libebackend/e-collection-backend.c | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)
---
diff --git a/src/libebackend/e-collection-backend.c b/src/libebackend/e-collection-backend.c
index 7679accaf..d1b899fce 100644
--- a/src/libebackend/e-collection-backend.c
+++ b/src/libebackend/e-collection-backend.c
@@ -461,6 +461,7 @@ collection_backend_bind_child_enabled (ECollectionBackend *backend,
        ESource *collection_source;
        ESourceCollection *extension;
        const gchar *extension_name;
+       guint binding_flags = G_BINDING_DEFAULT;
 
        /* See if the child source's "enabled" property can be
         * bound to any ESourceCollection "enabled" properties. */
@@ -469,11 +470,18 @@ collection_backend_bind_child_enabled (ECollectionBackend *backend,
        collection_source = e_backend_get_source (E_BACKEND (backend));
        extension = e_source_get_extension (collection_source, extension_name);
 
+       if (!e_source_get_enabled (collection_source) ||
+           e_collection_backend_is_new_source (backend, child_source))
+               binding_flags |= G_BINDING_SYNC_CREATE;
+
        if (collection_backend_child_is_calendar (child_source)) {
+               if (!e_source_collection_get_calendar_enabled (extension))
+                       binding_flags |= G_BINDING_SYNC_CREATE;
+
                e_binding_bind_property_full (
                        extension, "calendar-enabled",
                        child_source, "enabled",
-                       G_BINDING_SYNC_CREATE,
+                       binding_flags,
                        include_master_source_enabled_transform,
                        include_master_source_enabled_transform,
                        backend,
@@ -482,10 +490,13 @@ collection_backend_bind_child_enabled (ECollectionBackend *backend,
        }
 
        if (collection_backend_child_is_contacts (child_source)) {
+               if (!e_source_collection_get_contacts_enabled (extension))
+                       binding_flags |= G_BINDING_SYNC_CREATE;
+
                e_binding_bind_property_full (
                        extension, "contacts-enabled",
                        child_source, "enabled",
-                       G_BINDING_SYNC_CREATE,
+                       binding_flags,
                        include_master_source_enabled_transform,
                        include_master_source_enabled_transform,
                        backend,
@@ -494,10 +505,13 @@ collection_backend_bind_child_enabled (ECollectionBackend *backend,
        }
 
        if (collection_backend_child_is_mail (child_source)) {
+               if (!e_source_collection_get_mail_enabled (extension))
+                       binding_flags |= G_BINDING_SYNC_CREATE;
+
                e_binding_bind_property_full (
                        extension, "mail-enabled",
                        child_source, "enabled",
-                       G_BINDING_SYNC_CREATE,
+                       binding_flags,
                        include_master_source_enabled_transform,
                        include_master_source_enabled_transform,
                        backend,
@@ -508,7 +522,7 @@ collection_backend_bind_child_enabled (ECollectionBackend *backend,
        e_binding_bind_property (
                collection_source, "enabled",
                child_source, "enabled",
-               G_BINDING_SYNC_CREATE);
+               binding_flags);
 }
 
 static void