continue the include dance

[apps/madmutt.git] / headers.c

diff --git a/headers.c b/headers.c
index d1f2e35..e05a7ea 100644 (file)
--- a/headers.c
+++ b/headers.c
@@ -11,23 +11,23 @@
 # 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 "alias.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)
+                        HEADER * msg, char *fcc, ssize_t fcclen)
 {
   char path[_POSIX_PATH_MAX];   /* tempfile used to edit headers + body */
   char buffer[LONG_STRING];
@@ -37,7 +37,7 @@ void mutt_edit_headers (const char *editor,
   ENVELOPE *n;
   time_t mtime;
   struct stat st;
-  LIST *cur, **last = NULL, *tmp;
+  string_list_t *cur, **last = NULL, *tmp;
 
   mutt_mktemp (path);
   if ((ofp = safe_fopen (path, "w")) == NULL) {
@@ -77,7 +77,7 @@ void mutt_edit_headers (const char *editor,
   }
 
   mutt_unlink (body);
-  mutt_free_list (&msg->env->userhdrs);
+  string_list_wipe(&msg->env->userhdrs);
 
   /* Read the temp file back in */
   if ((ifp = fopen (path, "r")) == NULL) {
@@ -103,7 +103,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;
 
@@ -111,7 +111,7 @@ void mutt_edit_headers (const char *editor,
 #ifdef USE_NNTP
     if (!option (OPTNEWSSEND))
 #endif
-      mutt_free_list (&msg->env->references);
+      string_list_wipe(&msg->env->references);
 
   mutt_expand_aliases_env (msg->env);
 
@@ -164,8 +164,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;
@@ -181,7 +180,7 @@ void mutt_edit_headers (const char *editor,
       *last = cur->next;
       cur = cur->next;
       tmp->next = NULL;
-      mutt_free_list (&tmp);
+      string_list_wipe(&tmp);
     }
   }
 }