X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=postpone.c;h=fd06b628b32179e53132f496c4ace0d4d5b96796;hp=174d8e106d8d04d7efba2334301d7e1329e00673;hb=b62cf5fb77a75e17b176141d232655e5bd8b7fe1;hpb=0dbe922d4298aed78dcba64b7c770f315a64505e

diff --git a/postpone.c b/postpone.c
index 174d8e1..fd06b62 100644
--- a/postpone.c
+++ b/postpone.c
@@ -8,36 +8,24 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# 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/lib-lib.h>
 
 #include <lib-mime/mime.h>
 
 #include <lib-ui/enter.h>
 #include <lib-ui/menu.h>
+#include <lib-ui/curses.h>
+#include <lib-mx/mx.h>
+
+#include <lib-sys/unix.h>
 
 #include "mutt.h"
 #include "handler.h"
 #include "sort.h"
 #include "thread.h"
-#include "mx.h"
 #include <lib-crypt/crypt.h>
 
 #include <imap/imap.h>
-#include <imap/mx_imap.h>
 
 static struct mapping_t PostponeHelp[] = {
   {N_("Exit"),  OP_EXIT},
@@ -634,7 +622,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
     else
       mutt_decode_attachment (b, &s);
 
-    if (safe_fclose (&s.fpout) != 0)
+    if (m_fclose(&s.fpout) != 0)
       goto bail;
 
     m_strreplace(&b->filename, file);