projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add some lua in the mime module as well.
[apps/madmutt.git]
/
mutt_libesmtp.c
diff --git
a/mutt_libesmtp.c
b/mutt_libesmtp.c
index
e8786d9
..
c77d4d2
100644
(file)
--- a/
mutt_libesmtp.c
+++ b/
mutt_libesmtp.c
@@
-355,8
+355,8
@@
int mutt_libesmtp_invoke (address_t * from, /* the sender */
SMTPFAIL ("smtp_add_message");
/* Initialize envelope sender */
SMTPFAIL ("smtp_add_message");
/* Initialize envelope sender */
- if (
option (OPTENVFROM) && EnvFrom
)
- envfrom =
EnvFrom
->mailbox;
+ if (
MTransport.use_envelope_fromoption && MTransport.envelope_from_address
)
+ envfrom =
MTransport.envelope_from_address
->mailbox;
if (!smtp_set_reverse_path (message, envfrom))
SMTPFAIL ("smtp_set_reverse_path");
if (!smtp_set_reverse_path (message, envfrom))
SMTPFAIL ("smtp_set_reverse_path");
@@
-365,7
+365,7
@@
int mutt_libesmtp_invoke (address_t * from, /* the sender */
do_dsn_ret (message);
/* set up 8bitmime flag */
do_dsn_ret (message);
/* set up 8bitmime flag */
- if (eightbit &&
option (OPTUSE8BITMIME)
)
+ if (eightbit &&
MTransport.use_8bitmime
)
smtp_8bitmime_set_body (message, E8bitmime_8BITMIME);
if ((fp = fopen (msg, "r")) == NULL)
smtp_8bitmime_set_body (message, E8bitmime_8BITMIME);
if ((fp = fopen (msg, "r")) == NULL)