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;
parameter_delval(&b->parameter, "x-mutt-noconv");
}
- s.fpout = m_tempfile(file, sizeof(file), NONULL(MCore.tmpdir), file);
+ s.fpout = m_tempfile(file, sizeof(file), NONULL(mod_core.tmpdir), file);
if (!s.fpout)
goto bail;
/* 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;