X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Fsend_message.c;h=ea5ac42caf309ac69159c621277ab527fe4d6ad9;hp=f5f8268a373297a88349f106a3380f036430b1ca;hb=085c217b8ea0c62b3604ef6526e481ee956e18c5;hpb=82c3f24804e87065cd45637137a7f98429ed6ad6 diff --git a/src/send_message.c b/src/send_message.c index f5f8268a3..ea5ac42ca 100644 --- a/src/send_message.c +++ b/src/send_message.c @@ -246,9 +246,6 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g if (ac_prefs->smtp_passwd) smtp_session->pass = g_strdup(ac_prefs->smtp_passwd); - else if (ac_prefs->tmp_smtp_pass) - smtp_session->pass = - g_strdup(ac_prefs->tmp_smtp_pass); else { smtp_session->pass = input_dialog_query_password_keep @@ -259,16 +256,11 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g session_destroy(session); return -1; } - ac_prefs->tmp_smtp_pass = - g_strdup(smtp_session->pass); } } else { smtp_session->user = g_strdup(ac_prefs->userid); if (ac_prefs->passwd) smtp_session->pass = g_strdup(ac_prefs->passwd); - else if (ac_prefs->tmp_pass) - smtp_session->pass = - g_strdup(ac_prefs->tmp_pass); else { smtp_session->pass = input_dialog_query_password_keep @@ -279,8 +271,6 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g session_destroy(session); return -1; } - ac_prefs->tmp_pass = - g_strdup(smtp_session->pass); } } } else { @@ -383,13 +373,6 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g gtk_main_iteration(); if (SMTP_SESSION(session)->error_val == SM_AUTHFAIL) { - if (ac_prefs->smtp_userid && ac_prefs->tmp_smtp_pass) { - g_free(ac_prefs->tmp_smtp_pass); - ac_prefs->tmp_smtp_pass = NULL; - } else if (ac_prefs->tmp_pass) { - g_free(ac_prefs->tmp_pass); - ac_prefs->tmp_pass = NULL; - } if (ac_prefs->session_smtp_passwd) { g_free(ac_prefs->session_smtp_passwd); ac_prefs->session_smtp_passwd = NULL;