From: Matthew Barnes <mbarnes@redhat.com>
Date: Fri, 8 Jun 2012 14:59:59 +0000 (-0400)
Subject: Tweak mail account enabled states during migration.
X-Git-Tag: upstream/3.7.4~808
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=75b31e1f371e23201936ab2ee27feeeacbc76ca5;p=platform%2Fupstream%2Fevolution-data-server.git

Tweak mail account enabled states during migration.
---

diff --git a/services/evolution-source-registry/evolution-source-registry-migrate-sources.c b/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
index f180e33..1de7b0d 100644
--- a/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
+++ b/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
@@ -638,6 +638,12 @@ migrate_parse_account (ParseData *parse_data,
 		E_SOURCE_GROUP_NAME,
 		"DisplayName", name);
 
+	/* Identity source gets the same enabled state. */
+	g_key_file_set_boolean (
+		parse_data->identity_key_file,
+		E_SOURCE_GROUP_NAME,
+		"Enabled", enabled);
+
 	/* Identity source is a child of the mail account. */
 	g_key_file_set_string (
 		parse_data->identity_key_file,
@@ -650,6 +656,15 @@ migrate_parse_account (ParseData *parse_data,
 		E_SOURCE_GROUP_NAME,
 		"DisplayName", name);
 
+	/* Always enable the transport source, even if the mail account
+	 * is disabled.  Evolution does not currently honor the enabled
+	 * setting on transports, so disabling the transport would only
+	 * confuse matters should Evolution honor it in the future. */
+	g_key_file_set_boolean (
+		parse_data->transport_key_file,
+		E_SOURCE_GROUP_NAME,
+		"Enabled", "true");
+
 	/* Transport source is a child of the mail account. */
 	g_key_file_set_string (
 		parse_data->transport_key_file,