X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvattach.c;h=fcad4919d7e6b0d30df6b0d94b9e691488305a77;hp=91428f18a70db07eb6ee15969c732912efed1383;hb=4670d23c56f21afaa7ef2e0289a47a6a0d112671;hpb=83532821ae9fab034d0d630b78330c9ea4ff4cf3

diff --git a/recvattach.c b/recvattach.c
index 91428f1..fcad491 100644
--- a/recvattach.c
+++ b/recvattach.c
@@ -138,8 +138,7 @@ ATTACHPTR **mutt_gen_attach_list (BODY * m,
         && (compose
             || (parent_type == -1
                 && ascii_strcasecmp ("alternative", m->subtype)))
-        && (!(WithCrypto & APPLICATION_PGP)
-            || !mutt_is_multipart_encrypted (m))
+        && (!mutt_is_multipart_encrypted (m))
       ) {
       idx =
         mutt_gen_attach_list (m->parts, m->type, idx, idxlen, idxmax, level,
@@ -156,14 +155,12 @@ ATTACHPTR **mutt_gen_attach_list (BODY * m,
       new->level = level;
 
       /* We don't support multipart messages in the compose menu yet */
-      if (!compose && !m->collapsed &&
-          ((m->type == TYPEMULTIPART && (!(WithCrypto & APPLICATION_PGP)
-                                         || !mutt_is_multipart_encrypted (m))
-           )
-           || mutt_is_message_type (m->type, m->subtype))) {
-        idx =
-          mutt_gen_attach_list (m->parts, m->type, idx, idxlen, idxmax,
-                                level + 1, compose);
+      if (!compose && !m->collapsed
+      &&  ((m->type == TYPEMULTIPART && !mutt_is_multipart_encrypted(m))
+      ||  mutt_is_message_type (m->type, m->subtype)))
+      {
+        idx = mutt_gen_attach_list (m->parts, m->type, idx, idxlen, idxmax,
+                                    level + 1, compose);
       }
     }
   }
@@ -841,8 +838,7 @@ mutt_attach_display_loop (MUTTMENU * menu, int op, FILE * fp, HEADER * hdr,
       break;
       /* functions which are passed through from the pager */
     case OP_CHECK_TRADITIONAL:
-      if (!(WithCrypto & APPLICATION_PGP)
-          || (hdr && hdr->security & PGP_TRADITIONAL_CHECKED)) {
+      if (hdr && hdr->security & PGP_TRADITIONAL_CHECKED) {
         op = OP_NULL;
         break;
       }
@@ -930,17 +926,16 @@ void mutt_view_attachments (HEADER * hdr)
     return;
 
 
-  if (WithCrypto && ((hdr->security & ENCRYPT) ||
-                     (mutt_is_application_smime (hdr->content) &
-                      SMIMEOPAQUE))) {
+  if ((hdr->security & ENCRYPT) ||
+      (mutt_is_application_smime (hdr->content) & SMIMEOPAQUE))
+  {
     need_secured = 1;
 
     if ((hdr->security & ENCRYPT) && !crypt_valid_passphrase (hdr->security)) {
       mx_close_message (&msg);
       return;
     }
-    if ((WithCrypto & APPLICATION_SMIME)
-        && (hdr->security & APPLICATION_SMIME)) {
+    if (hdr->security & APPLICATION_SMIME) {
       if (hdr->env)
         crypt_smime_getkeys (hdr->env);
 
@@ -964,7 +959,7 @@ void mutt_view_attachments (HEADER * hdr)
       else
         need_secured = 0;
     }
-    if ((WithCrypto & APPLICATION_PGP) && (hdr->security & APPLICATION_PGP)) {
+    if (hdr->security & APPLICATION_PGP) {
       if (mutt_is_multipart_encrypted (hdr->content))
         secured = !crypt_pgp_decrypt_mime (msg->fp, &fp, hdr->content, &cur);
       else
@@ -979,7 +974,7 @@ void mutt_view_attachments (HEADER * hdr)
     }
   }
 
-  if (!WithCrypto || !need_secured) {
+  if (!need_secured) {
     fp = msg->fp;
     cur = hdr->content;
   }
@@ -1038,21 +1033,19 @@ void mutt_view_attachments (HEADER * hdr)
       break;
 
     case OP_EXTRACT_KEYS:
-      if ((WithCrypto & APPLICATION_PGP)) {
-        crypt_pgp_extract_keys_from_attachment_list (fp, menu->tagprefix,
-                                                     menu->
-                                                     tagprefix ? cur :
-                                                     idx[menu->current]->
-                                                     content);
-        menu->redraw = REDRAW_FULL;
-      }
+      crypt_pgp_extract_keys_from_attachment_list (fp, menu->tagprefix,
+                                                   menu->
+                                                   tagprefix ? cur :
+                                                   idx[menu->current]->
+                                                   content);
+      menu->redraw = REDRAW_FULL;
       break;
 
     case OP_CHECK_TRADITIONAL:
-      if ((WithCrypto & APPLICATION_PGP)
-          && crypt_pgp_check_traditional (fp, menu->tagprefix ? cur
+      if (crypt_pgp_check_traditional (fp, menu->tagprefix ? cur
                                           : idx[menu->current]->content,
-                                          menu->tagprefix)) {
+                                          menu->tagprefix))
+      {
         hdr->security = crypt_query (cur);
         menu->redraw = REDRAW_FULL;
       }
@@ -1103,10 +1096,9 @@ void mutt_view_attachments (HEADER * hdr)
       }
 #endif
 
-      if (WithCrypto && (hdr->security & (~PGP_TRADITIONAL_CHECKED))) {
+      if (hdr->security & (~PGP_TRADITIONAL_CHECKED)) {
         mutt_message
-          _
-          ("Deletion of attachments from encrypted messages is unsupported.");
+          _("Deletion of attachments from encrypted messages is unsupported.");
       }
       else {
         if (!menu->tagprefix) {
@@ -1252,7 +1244,7 @@ void mutt_view_attachments (HEADER * hdr)
       p_delete(&idx);
       idxmax = 0;
 
-      if (WithCrypto && need_secured && secured) {
+      if (need_secured && secured) {
         fclose (fp);
         mutt_free_body (&cur);
       }