X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=3d8f6efcb32c28ae2e22abf54f084c785b24fdb6;hp=f13f5a534c16969ad400eeedbb44cf3197b50fd3;hb=5fbd8a74d24624a118c9b835b136c73b8da076d7;hpb=8e689b28eefc1a93797f299c33f7ec3e2e340329 diff --git a/main.c b/main.c index f13f5a5..3d8f6ef 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 @@ -45,11 +46,7 @@ extern int optind; #endif #ifdef USE_NNTP -#include -#endif - -#ifdef USE_LIBESMTP -#include +#include "nntp.h" #endif #ifdef USE_HCACHE @@ -57,21 +54,12 @@ extern int optind; #include #elif defined(HAVE_GDBM) #include -#elif defined(HAVE_DB4) -#include #endif #endif -#ifdef USE_GNUTLS #include -#endif - #include -#ifdef USE_SSL -#include -#endif - static const char *Notice = N_("\ Copyright (C) 1996-2002 Michael R. Elkins and others.\n\ Copyright (C) 2005 The Mutt-ng Team\n\ @@ -138,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)); @@ -159,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 @@ -173,39 +156,19 @@ 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 -#ifdef USE_GNUTLS printf (" gnutls %s\n", LIBGNUTLS_VERSION); -#endif - -#ifdef USE_SSL - printf (" %s\n",OPENSSL_VERSION_TEXT); -#endif - printf (" gpgme %s\n", GPGME_VERSION); puts (_("Compile Options:")); puts ( -#ifdef HOMESPOOL - " +HOMESPOOL " -#else - " -HOMESPOOL " -#endif #ifdef USE_SETGID "+USE_SETGID " #else @@ -233,104 +196,10 @@ static void show_version (void) #else "-USE_NNTP " #endif -#ifdef USE_SSL - "+USE_SSL " -#else - "-USE_SSL " -#endif -#ifdef USE_GNUTLS - "+USE_GNUTLS " -#else - "-USE_GNUTLS " -#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 ); @@ -340,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")); @@ -350,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."); @@ -370,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 */ @@ -427,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; @@ -608,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; } @@ -705,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) { @@ -783,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); @@ -833,5 +685,6 @@ int main (int argc, char **argv) } luaM_shutdown(); + mutt_sasl_shutdown(); exit (0); }