X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=postpone.c;h=4b91fe8de854cf8fe89dda38a774a359b9a293f7;hp=c5035431ae290ed5c34d970e6fd4c4d6cf993cdd;hb=23e6291cb5d5b4cd2008403d8b628007fd75ff23;hpb=22601f25ede6703ba7cd06ee84eddd2045308570

diff --git a/postpone.c b/postpone.c
index c503543..4b91fe8 100644
--- a/postpone.c
+++ b/postpone.c
@@ -12,6 +12,11 @@
 # 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>
@@ -21,10 +26,11 @@
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
+
 #include "mutt.h"
-#include "enter.h"
 #include "handler.h"
-#include "mutt_menu.h"
 #include "rfc1524.h"
 #include "sort.h"
 #include "thread.h"
@@ -34,13 +40,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},
@@ -89,10 +88,7 @@ int mutt_num_postponed (int force)
       newpc = imap_mailbox_check (Postponed, 0);
       if (newpc >= 0) {
         PostCount = newpc;
-        debug_print (2, ("%d postponed IMAP messages found.\n", PostCount));
       }
-      else
-        debug_print (2, ("using old IMAP postponed count.\n"));
     }
     return PostCount;
   }
@@ -147,7 +143,7 @@ void mutt_update_num_postponed (void)
   UpdateNumPostponed = 1;
 }
 
-static void post_entry (char *s, size_t slen, MUTTMENU * menu, int entry)
+static void post_entry (char *s, ssize_t slen, MUTTMENU * menu, int entry)
 {
   CONTEXT *ctx = (CONTEXT *) menu->data;
 
@@ -229,13 +225,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;
 
@@ -309,7 +305,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;
@@ -326,7 +322,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
@@ -343,7 +339,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) {
@@ -357,7 +353,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;
     }
 
@@ -365,7 +361,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) {
@@ -379,7 +375,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