X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=main.c;h=a47a8279984033695afa37267e9034f6c21dd835;hb=84bc6d1930165b21919541b3b24294a9d99c3541;hp=90d5e1a27d56dbfbcaf8e0cb931ae5f0e34772a6;hpb=97e1d274dfbeb8b4a5da3f2b68fb66f96b7739d3;p=apps%2Fmadmutt.git

diff --git a/main.c b/main.c
index 90d5e1a..a47a827 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,11 +196,6 @@ static void show_version (void)
 #else
          "-USE_NNTP  "
 #endif
-#ifdef USE_LIBESMTP
-         "+USE_LIBESMTP  "
-#else
-         "-USE_LIBESMTP  "
-#endif
 #ifdef HAVE_LIBIDN
          "+HAVE_LIBIDN  "
 #else
@@ -239,15 +220,9 @@ 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.");