X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=postpone.c;h=b5193ec86b77896f140e4dc90d07448a2b25df15;hp=1f5f0007d6c8034249c33f02f6cdb03bb27f10e5;hb=ac813896ca32d850febc2d95065ac4fa040f11f9;hpb=ecfcc6df70230ba136c2fb3843700ecb749c41b7

diff --git a/postpone.c b/postpone.c
index 1f5f000..b5193ec 100644
--- a/postpone.c
+++ b/postpone.c
@@ -12,20 +12,26 @@
 # include "config.h"
 #endif
 
+#include <ctype.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/stat.h>
+
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
 #include <lib-lib/mapping.h>
+#include <lib-lib/debug.h>
 
 #include <lib-mime/mime.h>
 
 #include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
 
 #include "mutt.h"
 #include "handler.h"
-#include "mutt_menu.h"
 #include "rfc1524.h"
 #include "sort.h"
 #include "thread.h"
@@ -35,13 +41,6 @@
 #include <imap/imap.h>
 #include <imap/mx_imap.h>
 
-#include "lib/debug.h"
-
-#include <ctype.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/stat.h>
-
 static struct mapping_t PostponeHelp[] = {
   {N_("Exit"),  OP_EXIT},
   {N_("Del"),   OP_DELETE},
@@ -230,13 +229,13 @@ static HEADER *select_msg (void)
  *	SENDREPLY	recalled message is a reply
  */
 int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
-                        size_t fcclen)
+                        ssize_t fcclen)
 {
   HEADER *h;
   int code = SENDPOSTPONED;
-  LIST *tmp;
-  LIST *last = NULL;
-  LIST *next;
+  string_list_t *tmp;
+  string_list_t *last = NULL;
+  string_list_t *next;
   char *p;
   int opt_delete;
 
@@ -310,7 +309,7 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
       else
         hdr->env->userhdrs = tmp->next;
       tmp->next = NULL;
-      mutt_free_list (&tmp);
+      string_list_wipe(&tmp);
       tmp = next;
       if (*cur)
         code |= SENDREPLY;
@@ -327,7 +326,7 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
       else
         hdr->env->userhdrs = tmp->next;
       tmp->next = NULL;
-      mutt_free_list (&tmp);
+      string_list_wipe(&tmp);
       tmp = next;
     }
     else if ((m_strncmp("Pgp:", tmp->data, 4) == 0       /* this is generated
@@ -344,7 +343,7 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
       else
         hdr->env->userhdrs = tmp->next;
       tmp->next = NULL;
-      mutt_free_list (&tmp);
+      string_list_wipe(&tmp);
       tmp = next;
     }
     else if (m_strncmp("X-Mutt-SMIME:", tmp->data, 13) == 0) {
@@ -358,7 +357,7 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
       else
         hdr->env->userhdrs = tmp->next;
       tmp->next = NULL;
-      mutt_free_list (&tmp);
+      string_list_wipe(&tmp);
       tmp = next;
     }
 
@@ -366,7 +365,7 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
     else if (m_strncmp("X-Mutt-Mix:", tmp->data, 11) == 0) {
       char *t;
 
-      mutt_free_list (&hdr->chain);
+      string_list_wipe(&hdr->chain);
 
       t = strtok (tmp->data + 11, " \t\n");
       while (t) {
@@ -380,7 +379,7 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
       else
         hdr->env->userhdrs = tmp->next;
       tmp->next = NULL;
-      mutt_free_list (&tmp);
+      string_list_wipe(&tmp);
       tmp = next;
     }
 #endif