[evolution-data-server/gnome-3-6] Revert "Bug #678400 - ECollectionBackend populates disabled accounts"

[Matthew Barnes <mbarnes src gnome org>]

commit 99f0208d4005f2650729c9b63a629c17e1cd964b
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Oct 23 14:31:04 2012 -0400

    Revert "Bug #678400 - ECollectionBackend populates disabled accounts"
    
    This reverts commit 20d7ae7dd4ba86a65a74a05146d6c143a725c3c4.
    
    Need to find a better solution than corrupting what are supposed to be
    separate state flags.

 libebackend/e-collection-backend.c |   37 +++++------------------------------
 1 files changed, 6 insertions(+), 31 deletions(-)
---
diff --git a/libebackend/e-collection-backend.c b/libebackend/e-collection-backend.c
index d332093..87b1861 100644
--- a/libebackend/e-collection-backend.c
+++ b/libebackend/e-collection-backend.c
@@ -349,19 +349,6 @@ collection_backend_child_is_mail (ESource *child_source)
 	return FALSE;
 }
 
-static gboolean
-include_master_source_enabled_transform (GBinding *binding,
-					 const GValue *source_value,
-					 GValue *target_value,
-					 gpointer backend)
-{
-	g_value_set_boolean (target_value,
-		g_value_get_boolean (source_value) &&
-		e_source_get_enabled (e_backend_get_source (backend)));
-
-	return TRUE;
-}
-
 static void
 collection_backend_bind_child_enabled (ECollectionBackend *backend,
                                        ESource *child_source)
@@ -378,38 +365,26 @@ collection_backend_bind_child_enabled (ECollectionBackend *backend,
 	extension = e_source_get_extension (collection_source, extension_name);
 
 	if (collection_backend_child_is_calendar (child_source)) {
-		g_object_bind_property_full (
+		g_object_bind_property (
 			extension, "calendar-enabled",
 			child_source, "enabled",
-			G_BINDING_SYNC_CREATE,
-			include_master_source_enabled_transform,
-			include_master_source_enabled_transform,
-			backend,
-			NULL);
+			G_BINDING_SYNC_CREATE);
 		return;
 	}
 
 	if (collection_backend_child_is_contacts (child_source)) {
-		g_object_bind_property_full (
+		g_object_bind_property (
 			extension, "contacts-enabled",
 			child_source, "enabled",
-			G_BINDING_SYNC_CREATE,
-			include_master_source_enabled_transform,
-			include_master_source_enabled_transform,
-			backend,
-			NULL);
+			G_BINDING_SYNC_CREATE);
 		return;
 	}
 
 	if (collection_backend_child_is_mail (child_source)) {
-		g_object_bind_property_full (
+		g_object_bind_property (
 			extension, "mail-enabled",
 			child_source, "enabled",
-			G_BINDING_SYNC_CREATE,
-			include_master_source_enabled_transform,
-			include_master_source_enabled_transform,
-			backend,
-			NULL);
+			G_BINDING_SYNC_CREATE);
 		return;
 	}
 }