#include <lib-lib/lib-lib.h>
-#include <lib-crypt/crypt.h>
-
#include "mime.h"
+#include "crypt.h"
int mutt_is_multipart_signed(BODY * b)
{
if (m->type == TYPETEXT && subtype == MIME_PLAIN) {
const char *p;
- if ((p = parameter_getval(m->parameter, "x-mutt-action"))
- || (p = parameter_getval(m->parameter, "x-action"))
- || (p = parameter_getval(m->parameter, "action")))
- {
+ if ((p = parameter_getval(m->parameter, "x-action"))) {
int tok = mime_which_token(p, -1);
switch (tok) {
- case MIME_PGP_SIGN:
+ case MIME_PGP_SIGNED:
t |= PGPSIGN;
break;
- case MIME_PGP_ENCRYPT:
+ case MIME_PGP_ENCRYPTED:
t |= PGPENCRYPT;
break;
case 'm': case 'M':
/* Not sure if this is the correct thing to do, but
it's required for compatibility with Outlook */
- return (SMIMESIGN | SMIMEOPAQUE);
+ return SMIMESIGN | SMIMEOPAQUE;
case 's': case 'S':
- return (SMIMESIGN | SMIMEOPAQUE);
+ return SMIMESIGN | SMIMEOPAQUE;
}
}
}