move history in lib-ui

[apps/madmutt.git] / postpone.c

diff --git a/postpone.c b/postpone.c
index e73b39b..945a704 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -12,19 +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 "enter.h"
 #include "handler.h"
-#include "mutt_menu.h"
 #include "rfc1524.h"
 #include "sort.h"
 #include "thread.h"
@@ -34,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},
@@ -147,7 +147,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;
 
@@ -541,7 +541,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
         || b == NULL) {
     err:
       mx_close_message (&msg);
-      mutt_free_envelope (&newhdr->env);
+      envelope_delete(&newhdr->env);
       mutt_free_body (&newhdr->content);
       mutt_error _("Decryption failed.");
 
@@ -679,7 +679,7 @@ bail:
     mx_close_message (&msg);
 
   if (rv == -1) {
-    mutt_free_envelope (&newhdr->env);
+    envelope_delete(&newhdr->env);
     mutt_free_body (&newhdr->content);
   }