[Commits] [SCM] claws branch, master, updated. 3.13.2-65-gc3c05b0

[ticho at claws-mail.org]

The branch, master has been updated
       via  c3c05b0c2f5f1d7defaf829176618bcaf36fa724 (commit)
      from  caa44e52c9f535bd0f2ebe5214fb601c63373bcc (commit)

Summary of changes:
 src/send_message.c |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)


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

    Fix SMTP password use with password store.

diff --git a/src/send_message.c b/src/send_message.c
index fc5a420..43eef33 100644
--- 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,

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail