projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
leftover
[apps/madmutt.git]
/
lib-mime
/
rfc822parse.c
diff --git
a/lib-mime/rfc822parse.c
b/lib-mime/rfc822parse.c
index
6aaae2f
..
40c84f5
100644
(file)
--- a/
lib-mime/rfc822parse.c
+++ b/
lib-mime/rfc822parse.c
@@
-331,7
+331,7
@@
void mutt_parse_content_type(char *s, BODY *ct)
pc = parameter_getval(ct->parameter, "charset");
if (!pc) {
parameter_setval(&ct->parameter, "charset",
pc = parameter_getval(ct->parameter, "charset");
if (!pc) {
parameter_setval(&ct->parameter, "charset",
- charset_getfirst(
AssumedC
harset));
+ charset_getfirst(
mod_cset.assumed_c
harset));
}
}
}
}
}
}
@@
-911,13
+911,6
@@
string_list_t **mutt_parse_rfc822_line(ENVELOPE *e, HEADER *hdr, char *line, cha
e->to = rfc822_parse_adrlist(e->to, p);
break;
e->to = rfc822_parse_adrlist(e->to, p);
break;
-#ifdef USE_NNTP
- case MIME_X_COMMENT_TO:
- if (!e->x_comment_to)
- e->x_comment_to = m_strdup(p);
- break;
-#endif
-
case MIME_X_LABEL:
e->x_label = m_strdup(p);
break;
case MIME_X_LABEL:
e->x_label = m_strdup(p);
break;
@@
-957,8
+950,8
@@
string_list_t **mutt_parse_rfc822_line(ENVELOPE *e, HEADER *hdr, char *line, cha
/* restore the original line */
line[m_strlen(line)] = ':';
/* restore the original line */
line[m_strlen(line)] = ':';
- if (weed &&
mutt_matches_ignore(line, Ignore
)
- && !
mutt_matches_ignore(line, UnIgnore
)) {
+ if (weed &&
string_list_contains(Ignore, line, "*"
)
+ && !
string_list_contains(UnIgnore, line, "*"
)) {
break;
}
break;
}
@@
-1034,15
+1027,12
@@
mutt_read_rfc822_header(FILE *f, HEADER *hdr, short user_hdrs, short weed)
{
/* if spam tag already exists, figure out how to amend it */
if (e->spam && *buf) {
{
/* if spam tag already exists, figure out how to amend it */
if (e->spam && *buf) {
- if (SpamSep) {
- /* If SpamSep defined, append with separator */
- mutt_buffer_addstr(e->spam, SpamSep);
- mutt_buffer_addstr(e->spam, buf);
+ if (mod_mime.spam_separator) {
+ mutt_buffer_addstr(e->spam, mod_mime.spam_separator);
} else {
} else {
- /* else overwrite */
mutt_buffer_reset(e->spam);
mutt_buffer_reset(e->spam);
- mutt_buffer_addstr(e->spam, buf);
}
}
+ mutt_buffer_addstr(e->spam, buf);
}
if (!e->spam) {
}
if (!e->spam) {