X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=main.c;h=7f5581a673e40b8de996d8e465dfca4206a4a323;hb=bd0ed9bc7c534be30b0140b341b4d8a390483dbd;hp=3d1e21cd7817df94458586a03cad5ed53ebc3947;hpb=23e6291cb5d5b4cd2008403d8b628007fd75ff23;p=apps%2Fmadmutt.git

diff --git a/main.c b/main.c
index 3d1e21c..7f5581a 100644
--- a/main.c
+++ b/main.c
@@ -15,24 +15,10 @@
 
 #define MAIN_C 1
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <string.h>
-#include <stdlib.h>
-#include <locale.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/stat.h>
 #include <sys/utsname.h>
 
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/url.h>
-
 #include <lib-sys/mutt_signal.h>
 
 #include <lib-mime/mime.h>
@@ -370,11 +356,6 @@ static void show_version (void)
          "+CRYPT_BACKEND_GPGME  "
 #else
          "-CRYPT_BACKEND_GPGME  "
-#endif
-#ifdef BUFFY_SIZE
-         "+BUFFY_SIZE "
-#else
-         "-BUFFY_SIZE "
 #endif
          "\n  "
 #ifdef ENABLE_NLS
@@ -403,11 +384,6 @@ static void show_version (void)
 #else
          "-HAVE_ICONV  "
 #endif
-#if ICONV_NONTRANS
-         "+ICONV_NONTRANS  "
-#else
-         "-ICONV_NONTRANS  "
-#endif
 #ifdef HAVE_LIBIDN
          "+HAVE_LIBIDN  "
 #else
@@ -684,7 +660,6 @@ int main (int argc, char **argv)
     start_curses ();
 
   /* set defaults and read init files */
-  mx_init ();
   mutt_init (flags & M_NOSYSRC, commands);
   string_list_wipe(&commands);