talons

commit c3c05b0c2f5f1d7defaf829176618bcaf36fa724
parent caa44e52c9f535bd0f2ebe5214fb601c63373bcc
Author: Andrej Kacian <ticho@claws-mail.org>
Date:   Tue,  1 Mar 2016 21:11:09 +0100

Fix SMTP password use with password store.

Diffstat:
M
src/send_message.c
 | 
12
++++--------

1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/send_message.c b/src/send_message.c
@@ -304,11 +304,9 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
 							ac_prefs->smtp_server, "smtp", port,
 							&(smtp_session->pass))) {
 					/* NOP */;
-				} else if (ac_prefs->smtp_passwd)
-					smtp_session->pass =
+				} else if ((smtp_session->pass =
 						passwd_store_get(PWS_ACCOUNT, ac_prefs->account_name,
-								PWS_ACCOUNT_SEND);
-				else {
+								PWS_ACCOUNT_SEND)) == NULL) {
 					smtp_session->pass =
 						input_dialog_query_password_keep
 							(ac_prefs->smtp_server,
@@ -325,10 +323,8 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
 							ac_prefs->smtp_server, "smtp", port,
 							&(smtp_session->pass))) {
 					/* NOP */;
-				} else if (ac_prefs->passwd)
-					smtp_session->pass = passwd_store_get(PWS_ACCOUNT,
-							ac_prefs->account_name, PWS_ACCOUNT_RECV);
-				else {
+				} else if ((smtp_session->pass = passwd_store_get(PWS_ACCOUNT,
+							ac_prefs->account_name, PWS_ACCOUNT_RECV)) == NULL) {
 					smtp_session->pass =
 						input_dialog_query_password_keep
 							(ac_prefs->smtp_server,