X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account.c;h=2115d69854636fc789c33923f89802efc29bca6e;hp=8b95766c000b0868a299d51aed225a7d2a4fd777;hb=41c33d2e51bef2ae3d750c2848ab13cb4bb8d392;hpb=871a63abb8f32f2ddec19ca53d015e895b995d69

diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c
index 8b95766..2115d69 100644
--- a/src/modest-tny-account.c
+++ b/src/modest-tny-account.c
@@ -336,8 +336,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;
@@ -365,8 +363,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) ) {
@@ -534,13 +531,6 @@ modest_tny_account_update_from_account (TnyAccount *tny_account,
 	g_object_unref (server_settings);
 	g_object_unref (settings);
 
-	tny_account_set_forget_pass_func (tny_account, NULL);
-	tny_account_set_pass_func (tny_account, NULL);
-	tny_account_set_forget_pass_func (tny_account,
-					  forget_pass_func ? forget_pass_func : forget_pass_dummy);
-	tny_account_set_pass_func (tny_account,
-				   get_pass_func ? get_pass_func: get_pass_dummy);
-
 	tny_account_set_connection_policy (tny_account, modest_default_connection_policy_new ());
 	
 	/* The callback will have an error for you if the reconnect