8 Merged fix for bug 86557 from trunk

pmo-diablo-r5169

diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c
index ac0db22..9ee4e85 100644 (file)
--- a/src/modest-tny-account.c
+++ b/src/modest-tny-account.c
@@ -337,8 +337,6 @@ update_tny_account (TnyAccount *tny_account,
                        if (protocol == MODEST_PROTOCOL_STORE_IMAP ||
                            protocol == MODEST_PROTOCOL_STORE_POP)
                                auth_mech_name = NULL;
-                       else if (protocol == MODEST_PROTOCOL_TRANSPORT_SMTP)
-                               auth_mech_name = NULL; 
                        else
                                auth_mech_name = MODEST_ACCOUNT_AUTH_PLAIN;
                        break;
@@ -366,8 +364,7 @@ update_tny_account (TnyAccount *tny_account,
                        break;
                }
                
-               if(auth_mech_name) 
-                       tny_account_set_secure_auth_mech (tny_account, auth_mech_name);
+               tny_account_set_secure_auth_mech (tny_account, auth_mech_name);
                
                if (modest_protocol_info_protocol_is_store(protocol) && 
                        (protocol == MODEST_PROTOCOL_STORE_IMAP) ) {