diff options
Diffstat (limited to 'src/send_message.c')
| -rw-r--r-- | src/send_message.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/send_message.c b/src/send_message.c index d5fc6e8..c0a7f59 100644 --- a/src/send_message.c +++ b/src/send_message.c | |||
| @@ -649,17 +649,14 @@ static gint send_message_smtp(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp) | |||
| 649 | 649 | ||
| 650 | if (ac_prefs->smtp_userid) { | 650 | if (ac_prefs->smtp_userid) { |
| 651 | smtp_session->user = g_strdup(ac_prefs->smtp_userid); | 651 | smtp_session->user = g_strdup(ac_prefs->smtp_userid); |
| 652 | if (ac_prefs->smtp_passwd) | 652 | if (ac_prefs->smtp_passwd) { |
| 653 | if (master_password_active()) { | 653 | /* TODO: check if the format is correct */ |
| 654 | smtp_session->pass = decrypt_with_master_password( | 654 | smtp_session->pass = decrypt_with_master_password( |
| 655 | ac_prefs->smtp_passwd); | 655 | ac_prefs->smtp_passwd); |
| 656 | } else { | 656 | } else if (ac_prefs->tmp_smtp_pass) { |
| 657 | smtp_session->pass = g_strdup(ac_prefs->smtp_passwd); | ||
| 658 | } | ||
| 659 | else if (ac_prefs->tmp_smtp_pass) | ||
| 660 | smtp_session->pass = | 657 | smtp_session->pass = |
| 661 | g_strdup(ac_prefs->tmp_smtp_pass); | 658 | g_strdup(ac_prefs->tmp_smtp_pass); |
| 662 | else { | 659 | } else { |
| 663 | smtp_session->pass = | 660 | smtp_session->pass = |
| 664 | input_query_password | 661 | input_query_password |
| 665 | (ac_prefs->smtp_server, | 662 | (ac_prefs->smtp_server, |