stupid off by one: skip the last ')' in a comment !

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

diff --git a/lib-mime/crypt.c b/lib-mime/crypt.c
index 919c3bb..2ef6c42 100644 (file)
--- a/lib-mime/crypt.c
+++ b/lib-mime/crypt.c
@@ -85,11 +85,10 @@ int mutt_is_application_pgp (BODY * m)
     int subtype = mime_which_token(m->subtype, -1);
 
     if (m->type == TYPEAPPLICATION) {
     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);
             int tok;
 
             tok = mime_which_token(parameter_getval(m->parameter, "x-action"), -1);

-

             if (tok == MIME_SIGN || tok == MIME_SIGNCLEAR)
                 t |= PGPSIGN;
 
             if (tok == MIME_SIGN || tok == MIME_SIGNCLEAR)
                 t |= PGPSIGN;
 


@@ -111,13 +110,10 @@ 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;
 


@@ -138,6 +134,8 @@ int mutt_is_application_pgp (BODY * m)
     return t ? t | PGPINLINE : 0;
 }
 
     return t ? t | PGPINLINE : 0;
 }
 

+#include "mutt.h"
+

 int mutt_is_application_smime (BODY * m)
 {
     char *t = NULL;
 int mutt_is_application_smime (BODY * m)
 {
     char *t = NULL;