workaround a stupid issue in how decoding is performed in mutt *sigh*

[apps/madmutt.git] / lib-mime / crypt.c

diff --git a/lib-mime/crypt.c b/lib-mime/crypt.c
index 0755b32..af64a2c 100644 (file)
--- a/lib-mime/crypt.c
+++ b/lib-mime/crypt.c
@@ -32,9 +32,8 @@
 
 #include <lib-lib/lib-lib.h>
 
 
 #include <lib-lib/lib-lib.h>
 

-#include <lib-crypt/crypt.h>
-

 #include "mime.h"
 #include "mime.h"

+#include "crypt.h"

 
 int mutt_is_multipart_signed(BODY * b)
 {
 
 int mutt_is_multipart_signed(BODY * b)
 {


@@ -110,17 +109,14 @@ int mutt_is_application_pgp (BODY * m)
     if (m->type == TYPETEXT && subtype == MIME_PLAIN) {
         const char *p;
 
     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) {
             int tok = mime_which_token(p, -1);
             switch (tok) {

-              case MIME_PGP_SIGN:
+              case MIME_PGP_SIGNED:

                 t |= PGPSIGN;
                 break;
 
                 t |= PGPSIGN;
                 break;
 

-              case MIME_PGP_ENCRYPT:
+              case MIME_PGP_ENCRYPTED:

                 t |= PGPENCRYPT;
                 break;
 
                 t |= PGPENCRYPT;
                 break;