* please see the file GPL in the top level source directory.
*/
-#include <lib-lib/macros.h>
-#include <lib-lib/str.h>
+#include <lib-lib/lib-lib.h>
#include <lib-crypt/crypt.h>
int subtype = mime_which_token(m->subtype, -1);
if (m->type == TYPEAPPLICATION) {
- if (subtype != MIME_PGP || subtype != MIME_X_PGP_MESSAGE) {
+ if (subtype == MIME_PGP || subtype == MIME_X_PGP_MESSAGE) {
int tok;
tok = mime_which_token(parameter_getval(m->parameter, "x-action"), -1);
-
if (tok == MIME_SIGN || tok == MIME_SIGNCLEAR)
t |= PGPSIGN;
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;
return t ? t | PGPINLINE : 0;
}
+#include "mutt.h"
+
int mutt_is_application_smime (BODY * m)
{
char *t = NULL;