projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
recvcmd.c
diff --git
a/recvcmd.c
b/recvcmd.c
index
f9f2268
..
00029bb
100644
(file)
--- a/
recvcmd.c
+++ b/
recvcmd.c
@@
-12,11
+12,14
@@
#endif
#include "mutt.h"
#endif
#include "mutt.h"
+#include "enter.h"
+#include "state.h"
+#include "handler.h"
+#include "recvattach.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "rfc1524.h"
#include "mime.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "rfc1524.h"
#include "mime.h"
-#include "mailbox.h"
#include "attach.h"
#include "mapping.h"
#include "mx.h"
#include "attach.h"
#include "mapping.h"
#include "mx.h"
@@
-150,7
+153,7
@@
void mutt_attach_bounce (FILE * fp, HEADER * hdr,
if (mutt_addrlist_to_idna (adr, &err) < 0) {
mutt_error (_("Bad IDN: '%s'"), err);
if (mutt_addrlist_to_idna (adr, &err) < 0) {
mutt_error (_("Bad IDN: '%s'"), err);
-
FREE
(&err);
+
mem_free
(&err);
rfc822_free_address (&adr);
return;
}
rfc822_free_address (&adr);
return;
}
@@
-170,10
+173,10
@@
void mutt_attach_bounce (FILE * fp, HEADER * hdr,
mutt_format_string (prompt, sizeof (prompt) - 4,
0, COLS - extra_space, 0, 0,
prompt, sizeof (prompt), 0);
mutt_format_string (prompt, sizeof (prompt) - 4,
0, COLS - extra_space, 0, 0,
prompt, sizeof (prompt), 0);
- s
afe_str
cat (prompt, sizeof (prompt), "...?");
+ s
tr_
cat (prompt, sizeof (prompt), "...?");
}
else
}
else
- s
afe_str
cat (prompt, sizeof (prompt), "?");
+ s
tr_
cat (prompt, sizeof (prompt), "?");
if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
rfc822_free_address (&adr);
if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
rfc822_free_address (&adr);
@@
-684,8
+687,8
@@
attach_reply_envelope_defaults (ENVELOPE * env, ATTACHPTR ** idx,
if ((flags & SENDNEWS)) {
/* in case followup set Newsgroups: with Followup-To: if it present */
if (!env->newsgroups && curenv &&
if ((flags & SENDNEWS)) {
/* in case followup set Newsgroups: with Followup-To: if it present */
if (!env->newsgroups && curenv &&
-
mutt_str
casecmp (curenv->followup_to, "poster"))
- env->newsgroups = s
afe_str
dup (curenv->followup_to);
+
str_
casecmp (curenv->followup_to, "poster"))
+ env->newsgroups = s
tr_
dup (curenv->followup_to);
}
else
#endif
}
else
#endif