projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simplify pop_query further.
[apps/madmutt.git]
/
postpone.c
diff --git
a/postpone.c
b/postpone.c
index
1145bf6
..
74490e4
100644
(file)
--- a/
postpone.c
+++ b/
postpone.c
@@
-312,10
+312,7
@@
int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
string_list_wipe(&tmp);
tmp = next;
}
string_list_wipe(&tmp);
tmp = next;
}
- else if ((m_strncmp("Pgp:", tmp->data, 4) == 0 /* this is generated
- * by old mutt versions
- */
- || m_strncmp("X-Mutt-PGP:", tmp->data, 11) == 0)) {
+ else if (m_strncmp("X-Mutt-PGP:", tmp->data, 11) == 0) {
hdr->security = mutt_parse_crypt_hdr (strchr (tmp->data, ':') + 1, 1);
hdr->security |= APPLICATION_PGP;
hdr->security = mutt_parse_crypt_hdr (strchr (tmp->data, ':') + 1, 1);
hdr->security |= APPLICATION_PGP;
@@
-633,7
+630,7
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
/* Theoretically, both could be set. Take the one the user wants to set by default. */
if ((newhdr->security & APPLICATION_PGP)
&& (newhdr->security & APPLICATION_SMIME)) {
/* Theoretically, both could be set. Take the one the user wants to set by default. */
if ((newhdr->security & APPLICATION_PGP)
&& (newhdr->security & APPLICATION_SMIME)) {
- if (
option (OPTSMIMEISDEFAULT)
)
+ if (
mod_crypt.smime_is_default
)
newhdr->security &= ~APPLICATION_PGP;
else
newhdr->security &= ~APPLICATION_SMIME;
newhdr->security &= ~APPLICATION_PGP;
else
newhdr->security &= ~APPLICATION_SMIME;