[evolution/gnome-3-4] Do not reset auth-mechanism for store-and-transport providers

[Milan Crha <mcrha src gnome org>]

commit 72dab6f97c49707aa7a5327e29dd602ab8142684
Author: Milan Crha <mcrha redhat com>
Date:   Tue Jun 5 12:35:33 2012 +0200

    Do not reset auth-mechanism for store-and-transport providers

 mail/em-account-editor.c |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 7b0d37a..4d5d829 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -5590,13 +5590,15 @@ emae_commit (EConfig *ec,
 	if (CAMEL_IS_NETWORK_SETTINGS (settings) && !requires_auth)
 		g_object_set (settings, "auth-mechanism", NULL, NULL);
 
-	settings = emae->priv->transport.settings;
-	requires_auth = emae_get_transport_requires_auth (emae);
-
-	/* Override the selected authentication mechanism name if
-	 * authentication is not required for the transport service. */
-	if (CAMEL_IS_NETWORK_SETTINGS (settings) && !requires_auth)
-		g_object_set (settings, "auth-mechanism", NULL, NULL);
+	if (!CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT (provider)) {
+		settings = emae->priv->transport.settings;
+		requires_auth = emae_get_transport_requires_auth (emae);
+
+		/* Override the selected authentication mechanism name if
+		 * authentication is not required for the transport service. */
+		if (CAMEL_IS_NETWORK_SETTINGS (settings) && !requires_auth)
+			g_object_set (settings, "auth-mechanism", NULL, NULL);
+	}
 
 	/* Dump the storage service settings to a URL string. */