X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=headers.c;h=ecb5756b7550576d0a457bc277a64c8d5563fdb7;hp=a9be3cd34c3de11f927150fd180067b5132b052a;hb=05a3bbbe420e4afc76e0eea24ce32f859405dc4a;hpb=93b012884de4ca5e1f2550f767d0b8680b9c0e9f

diff --git a/headers.c b/headers.c
index a9be3cd..ecb5756 100644
--- a/headers.c
+++ b/headers.c
@@ -11,20 +11,19 @@
 # include "config.h"
 #endif
 
+#include <sys/stat.h>
+#include <string.h>
+#include <ctype.h>
+
 #include <lib-lib/macros.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/file.h>
+#include <lib-lib/debug.h>
 
 #include "mutt.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 #include "mutt_idna.h"
 
-#include "lib/debug.h"
-
-#include <sys/stat.h>
-#include <string.h>
-#include <ctype.h>
-
 void mutt_edit_headers (const char *editor,
                         const char *body,
                         HEADER * msg, char *fcc, size_t fcclen)
@@ -103,7 +102,7 @@ void mutt_edit_headers (const char *editor,
   n->references = msg->env->references;
   msg->env->references = NULL;
 
-  mutt_free_envelope (&msg->env);
+  envelope_delete(&msg->env);
   msg->env = n;
   n = NULL;
 
@@ -137,7 +136,7 @@ void mutt_edit_headers (const char *editor,
       keep = 0;
     }
     else if (ascii_strncasecmp ("attach:", cur->data, 7) == 0) {
-      BODY *body;
+      BODY *bbody;
       BODY *parts;
       char *q;
 
@@ -150,10 +149,10 @@ void mutt_edit_headers (const char *editor,
         else
           m_strcpy(path, sizeof(path), p);
         mutt_expand_path (path, sizeof (path));
-        if ((body = mutt_make_file_attach (path))) {
-          body->description = m_strdup(q);
+        if ((bbody = mutt_make_file_attach (path))) {
+          bbody->description = m_strdup(q);
           for (parts = msg->content; parts->next; parts = parts->next);
-          parts->next = body;
+          parts->next = bbody;
         }
         else {
           mutt_pretty_mailbox (path);
@@ -164,8 +163,7 @@ void mutt_edit_headers (const char *editor,
     }
 
 
-    else if ((WithCrypto & APPLICATION_PGP)
-             && ascii_strncasecmp ("pgp:", cur->data, 4) == 0) {
+    else if (ascii_strncasecmp("pgp:", cur->data, 4) == 0) {
       msg->security = mutt_parse_crypt_hdr (cur->data + 4, 0);
       if (msg->security)
         msg->security |= APPLICATION_PGP;