projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make some code yet more simple, using the VERY good semantics of snprintf
[apps/madmutt.git]
/
postpone.c
diff --git
a/postpone.c
b/postpone.c
index
5fda6ce
..
4a08b97
100644
(file)
--- a/
postpone.c
+++ b/
postpone.c
@@
-343,8
+343,6
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
string_list_wipe(&tmp);
tmp = next;
}
string_list_wipe(&tmp);
tmp = next;
}
-
-#ifdef MIXMASTER
else if (m_strncmp("X-Mutt-Mix:", tmp->data, 11) == 0) {
char *t;
else if (m_strncmp("X-Mutt-Mix:", tmp->data, 11) == 0) {
char *t;
@@
-365,8
+363,6
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
string_list_wipe(&tmp);
tmp = next;
}
string_list_wipe(&tmp);
tmp = next;
}
-#endif
-
else {
last = tmp;
tmp = tmp->next;
else {
last = tmp;
tmp = tmp->next;
@@
-593,13
+589,10
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
s.flags = 0;
if (b->type == TYPETEXT) {
s.flags = 0;
if (b->type == TYPETEXT) {
- if (!ascii_strcasecmp
- ("yes", parameter_getval(b->parameter, "x-mutt-noconv")))
- b->noconv = 1;
- else {
+ b->noconv = !ascii_strcasecmp("yes", parameter_getval(b->parameter,
+ "x-mutt-noconv"));
+ if (b->noconv)
s.flags |= M_CHARCONV;
s.flags |= M_CHARCONV;
- b->noconv = 0;
- }
parameter_delval(&b->parameter, "x-mutt-noconv");
}
parameter_delval(&b->parameter, "x-mutt-noconv");
}