X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=f13f5a534c16969ad400eeedbb44cf3197b50fd3;hp=4a1fe591a901b9b7d07a2e5d3a659103f122906f;hb=8e689b28eefc1a93797f299c33f7ec3e2e340329;hpb=576172ff50f9dd94dd2f5cc91d247c1e50dbe7fc

diff --git a/main.c b/main.c
index 4a1fe59..f13f5a5 100644
--- a/main.c
+++ b/main.c
@@ -233,11 +233,6 @@ static void show_version (void)
 #else
          "-USE_NNTP  "
 #endif
-#ifdef USE_GSS
-         "+USE_GSS  "
-#else
-         "-USE_GSS  "
-#endif
 #ifdef USE_SSL
          "+USE_SSL  "
 #else
@@ -248,11 +243,6 @@ static void show_version (void)
 #else
          "-USE_GNUTLS  "
 #endif
-#ifdef USE_SASL
-         "+USE_SASL  "
-#else
-         "-USE_SASL  "
-#endif
 #ifdef USE_LIBESMTP
          "+USE_LIBESMTP  "
 #else
@@ -397,6 +387,17 @@ static void start_curses (void)
 #define M_NEWS    (1<<5)        /* -g and -G */
 #endif
 
+__attribute__((format(printf, 1, 0)))
+static void mutt_nocurses_error (const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    vfprintf(stderr, fmt, ap);
+    va_end(ap);
+    fputc('\n', stderr);
+}
+
 int main (int argc, char **argv)
 {
   char folder[_POSIX_PATH_MAX] = "";
@@ -435,8 +436,7 @@ int main (int argc, char **argv)
 
   setlocale (LC_CTYPE, "");
 
-  mutt_error = mutt_nocurses_error;
-  mutt_message = mutt_nocurses_error;
+  mutt_error = mutt_message = mutt_nocurses_error;
   srand48 (time (NULL));
   umask (077);