X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=801966b3c6b5bfec63c491ca7047baed4b447fad;hp=28d7f4ebe3889dd710251ad23aafa299dd24feaf;hb=4f8cd7c03aba20081ae3403ee194ce7e54f224fd;hpb=8fac066483c9ae3176984527c037190fca9dc7f0

diff --git a/main.c b/main.c
index 28d7f4e..801966b 100644
--- a/main.c
+++ b/main.c
@@ -32,6 +32,7 @@
 #include "sort.h"
 #include "keymap.h"
 #include "mutt_idna.h"
+#include "mutt_sasl.h"
 
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
@@ -48,17 +49,11 @@ extern int optind;
 #include <nntp/nntp.h>
 #endif
 
-#ifdef USE_LIBESMTP
-#include <libesmtp.h>
-#endif
-
 #ifdef USE_HCACHE
 #if defined(HAVE_QDBM)
 #include <depot.h>
 #elif defined(HAVE_GDBM)
 #include <gdbm.h>
-#elif defined(HAVE_DB4)
-#include <db.h>
 #endif
 #endif
 
@@ -131,9 +126,6 @@ options:\n\
 static void show_version (void)
 {
   struct utsname uts;
-#ifdef USE_LIBESMTP
-  char buf[STRING];
-#endif
 
   puts (mutt_make_version());
   puts (_(Notice));
@@ -166,19 +158,11 @@ static void show_version (void)
           stringprep_check_version (NULL), STRINGPREP_VERSION);
 #endif
 
-#ifdef USE_LIBESMTP
-  smtp_version (buf, sizeof (buf), 0);
-  printf ("  libESMTP %s\n", buf);
-#endif
-
 #ifdef USE_HCACHE
 #if defined(HAVE_QDBM)
   printf ("  qdbm %s\n", dpversion);
 #elif defined(HAVE_GDBM)
   printf ("  gdbm %s\n", gdbm_version);
-#elif defined(HAVE_DB4)
-  printf ("  DB4 %d.%d.%d\n", DB_VERSION_MAJOR, DB_VERSION_MINOR,
-          DB_VERSION_PATCH);
 #endif
 #endif
 
@@ -187,11 +171,6 @@ static void show_version (void)
   puts (_("Compile Options:"));
 
   puts (
-#ifdef HOMESPOOL
-         "  +HOMESPOOL  "
-#else
-         "  -HOMESPOOL  "
-#endif
 #ifdef USE_SETGID
          "+USE_SETGID  "
 #else
@@ -219,94 +198,10 @@ static void show_version (void)
 #else
          "-USE_NNTP  "
 #endif
-#ifdef USE_LIBESMTP
-         "+USE_LIBESMTP  "
-#else
-         "-USE_LIBESMTP  "
-#endif
-         "\n  "
-#ifdef HAVE_REGCOMP
-         "+HAVE_REGCOMP  "
-#else
-         "-HAVE_REGCOMP  "
-#endif
-         "\n  "
-#ifdef HAVE_START_COLOR
-         "+HAVE_START_COLOR  "
-#else
-         "-HAVE_START_COLOR  "
-#endif
-#ifdef HAVE_TYPEAHEAD
-         "+HAVE_TYPEAHEAD  "
-#else
-         "-HAVE_TYPEAHEAD  "
-#endif
-#ifdef HAVE_BKGDSET
-         "+HAVE_BKGDSET  "
-#else
-         "-HAVE_BKGDSET  "
-#endif
-         "\n  "
-#ifdef HAVE_CURS_SET
-         "+HAVE_CURS_SET  "
-#else
-         "-HAVE_CURS_SET  "
-#endif
-#ifdef HAVE_META
-         "+HAVE_META  "
-#else
-         "-HAVE_META  "
-#endif
-#ifdef HAVE_RESIZETERM
-         "+HAVE_RESIZETERM  "
-#else
-         "-HAVE_RESIZETERM  "
-#endif
-    );
-
-  puts (
-         "+CRYPT_BACKEND_GPGME  "
-         "\n  "
-#ifdef ENABLE_NLS
-         "+ENABLE_NLS  "
-#else
-         "-ENABLE_NLS  "
-#endif
-#ifdef HAVE_WC_FUNCS
-         "+HAVE_WC_FUNCS  "
-#else
-         "-HAVE_WC_FUNCS  "
-#endif
-#ifdef HAVE_LANGINFO_CODESET
-         "+HAVE_LANGINFO_CODESET  "
-#else
-         "-HAVE_LANGINFO_CODESET  "
-#endif
-#ifdef HAVE_LANGINFO_YESEXPR
-         "+HAVE_LANGINFO_YESEXPR  "
-#else
-         "-HAVE_LANGINFO_YESEXPR  "
-#endif
-         "\n  "
-#ifdef HAVE_ICONV
-         "+HAVE_ICONV  "
-#else
-         "-HAVE_ICONV  "
-#endif
 #ifdef HAVE_LIBIDN
          "+HAVE_LIBIDN  "
 #else
          "-HAVE_LIBIDN  "
-#endif
-#ifdef HAVE_GETSID
-         "+HAVE_GETSID  "
-#else
-         "-HAVE_GETSID  "
-#endif
-#ifdef HAVE_GETADDRINFO
-         "+HAVE_GETADDRINFO  "
-#else
-         "-HAVE_GETADDRINFO  "
 #endif
     );
 
@@ -403,13 +298,9 @@ int main (int argc, char **argv)
     exit (1);
   }
 
-#ifdef ENABLE_NLS
-  /* FIXME what about init.c:1439 ? */
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, MUTTLOCALEDIR);
   textdomain (PACKAGE);
-#endif
-
   setlocale (LC_CTYPE, "");
 
   mutt_error = mutt_message = mutt_nocurses_error;
@@ -681,7 +572,7 @@ int main (int argc, char **argv)
 
       /* is the following if still needed? */
 
-      fout = m_tempfile(buf, sizeof(buf), NONULL(MCore.tmpdir), NULL);
+      fout = m_tempfile(buf, sizeof(buf), NONULL(mod_core.tmpdir), NULL);
       tempfile = m_strdup(buf);
 
       if (tempfile) {
@@ -759,7 +650,8 @@ int main (int argc, char **argv)
         exit (1);
       }
       folder[0] = 0;
-      mutt_select_file (folder, sizeof (folder), M_SEL_FOLDER | M_SEL_BUFFY);
+      mutt_select_file(folder, sizeof(folder), M_SEL_FOLDER | M_SEL_BUFFY,
+                       NULL, NULL);
       if (!folder[0]) {
         mutt_endwin (NULL);
         exit (0);
@@ -809,5 +701,6 @@ int main (int argc, char **argv)
   }
 
   luaM_shutdown();
+  mutt_sasl_shutdown();
   exit (0);
 }