X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=3d8f6efcb32c28ae2e22abf54f084c785b24fdb6;hp=35f084ed968a19960af6852c0e2a44185e0c18f2;hb=5fbd8a74d24624a118c9b835b136c73b8da076d7;hpb=366c938a78d928880c77bfe31a8715184c918d41

diff --git a/main.c b/main.c
index 35f084e..3d8f6ef 100644
--- a/main.c
+++ b/main.c
@@ -46,11 +46,7 @@ extern int optind;
 #endif
 
 #ifdef USE_NNTP
-#include <nntp/nntp.h>
-#endif
-
-#ifdef USE_LIBESMTP
-#include <libesmtp.h>
+#include "nntp.h"
 #endif
 
 #ifdef USE_HCACHE
@@ -130,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));
@@ -151,8 +144,6 @@ static void show_version (void)
 
 #ifdef NCURSES_VERSION
   printf ("  ncurses %s\n", NCURSES_VERSION);
-#elif defined(USE_SLANG_CURSES)
-  printf ("  slang %d\n", SLANG_VERSION);
 #endif
 
 #ifdef _LIBICONV_VERSION
@@ -165,11 +156,6 @@ 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);
@@ -210,20 +196,6 @@ static void show_version (void)
 #else
          "-USE_NNTP  "
 #endif
-#ifdef USE_LIBESMTP
-         "+USE_LIBESMTP  "
-#else
-         "-USE_LIBESMTP  "
-#endif
-         "\n  "
-    );
-
-  puts (
-#ifdef ENABLE_NLS
-         "+ENABLE_NLS  "
-#else
-         "-ENABLE_NLS  "
-#endif
 #ifdef HAVE_LIBIDN
          "+HAVE_LIBIDN  "
 #else
@@ -237,7 +209,6 @@ static void show_version (void)
   printf ("  +PKGDATADIR=\"%s\"\n", PKGDATADIR);
   printf ("  +PKGDOCDIR=\"%s\"\n", PKGDOCDIR);
   printf ("  +SYSCONFDIR=\"%s\"\n", SYSCONFDIR);
-  printf ("  +MIXMASTER=\"%s\"\n\n", MIXMASTER);
 
   puts (_("MadMutt is based on Madmutt wich was based on Mutt before\n"));
 
@@ -247,16 +218,7 @@ static void show_version (void)
 static void start_curses (void)
 {
   km_init ();                   /* must come before mutt_init */
-
-#ifdef USE_SLANG_CURSES
-  SLtt_Ignore_Beep = 1;         /* don't do that #*$@^! annoying visual beep! */
-  SLsmg_Display_Eight_Bit = 128;        /* characters above this are printable */
-  SLtt_set_color (0, NULL, "default", "default");
-#else
-  /* should come before initscr() so that ncurses 4.2 doesn't try to install
-     its own SIGWINCH handler */
   mutt_signal_initialize ();
-#endif
   if (initscr () == NULL) {
     puts _("Error initializing terminal.");
 
@@ -267,12 +229,8 @@ static void start_curses (void)
   keypad (stdscr, TRUE);
   cbreak ();
   noecho ();
-#ifdef HAVE_TYPEAHEAD
   typeahead (-1);               /* simulate smooth scrolling */
-#endif
-#ifdef HAVE_META
   meta (stdscr, TRUE);
-#endif
 }
 
 #define M_IGNORE  (1<<0)        /* -z */
@@ -324,13 +282,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;
@@ -505,7 +459,7 @@ int main (int argc, char **argv)
 
   if (!option (OPTNOCURSES)) {
     SETCOLOR (MT_COLOR_NORMAL);
-    clear ();
+    wclear (stdscr);
     mutt_error = mutt_curses_error;
     mutt_message = mutt_curses_message;
   }
@@ -602,7 +556,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) {
@@ -680,7 +634,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);