* Fixes NB#86557, changes in auth methods are now properly applied without restarting

[modest] / src / modest-tny-account.c

diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c
index 8b95766..2115d69 100644 (file)
--- 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;
                        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;
                        else
                                auth_mech_name = MODEST_ACCOUNT_AUTH_PLAIN;
                        break;

@@ -365,8 +363,7 @@ update_tny_account (TnyAccount *tny_account,
                        break;
                }
                
                        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) ) {
                
                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);
 
        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
        tny_account_set_connection_policy (tny_account, modest_default_connection_policy_new ());
        
        /* The callback will have an error for you if the reconnect