From: Alberto Garcia <agarcia@igalia.com>
Date: Fri, 17 Aug 2007 17:09:05 +0000 (+0000)
Subject:     * src/modest-tny-account-store.c
X-Git-Tag: git_migration_finished~2566
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=9ab3f9d0057226978b1ad756f37f84f8bff2fc5e

* src/modest-tny-account-store.c
    (get_smtp_specific_transport_account_for_open_connection):
    Don't try to use a connection-specific SMTP server if the option
    is disabled for that account

pmo-trunk-r3014
---

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index 9faf6a2..e46ca55 100644
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -1413,6 +1413,12 @@ get_smtp_specific_transport_account_for_open_connection (ModestTnyAccountStore *
 	
 	/*  Get the connection-specific transport acccount, if any: */
 	ModestAccountMgr *account_manager = modest_runtime_get_account_mgr ();
+
+        /* Check if this account has connection-specific SMTP enabled */
+        if (!modest_account_mgr_get_use_connection_specific_smtp (account_manager, account_name)) {
+                return NULL;
+        }
+
 	gchar* server_account_name = modest_account_mgr_get_connection_specific_smtp (account_manager, 
 		account_name, connection_name);