Simplify sidebar code

[apps/madmutt.git] / muttlib.c

diff --git a/muttlib.c b/muttlib.c
index 0e396e6..2cf42eb 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -8,31 +8,19 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
 #include <grp.h>
 #include <pwd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <time.h>
-#include <unistd.h>
 #include <utime.h>
 
-#include <lib-lib/lib-lib.h>
-
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>
 #include <lib-ui/enter.h>
 
+#include <lib-sys/unix.h>
+
 #include "alias.h"
 #include "mutt.h"
 #include "mx.h"
@@ -381,7 +369,7 @@ void mutt_merge_envelopes(ENVELOPE* base, ENVELOPE** extra)
   envelope_delete(extra);
 }
 
-void _mutt_mktemp (char *s, const char *src, int line)
+void mutt_mktemp (char *s)
 {
 
   snprintf (s, _POSIX_PATH_MAX, "%s/madmutt-%s-%d-%d-%d-%x%x", NONULL (Tempdir),