X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=c08122935a44f5dbcf6b54659e63bce2fe0fa335;hp=89fa6d399088cd5062ae733532e134361120cc67;hb=377cbd44d1e296a96a5d07c1f26386a4fff80cc9;hpb=07232d8229d07417da518d8c68a80f5386905d8d

diff --git a/main.c b/main.c
index 89fa6d3..c081229 100644
--- a/main.c
+++ b/main.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>
  * Copyright (C) 1999-2002 Thomas Roessler <roessler@does-not-exist.org>
+ * Copyright (C) 2004 g10 Code GmbH
  * 
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -19,6 +20,10 @@
 
 #define MAIN_C 1
 
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "mutt.h"
 #include "mutt_curses.h"
 #include "keymap.h"
@@ -48,14 +53,14 @@
 #endif
 
 static const char *ReachingUs = N_("\
-To contact the developers, please mail to <mutt-dev@mutt.org>.\n\
-To report a bug, please use the flea(1) utility.\n");
+To contact the developers, please mail to <mutt-ng-devel@lists.berlios.de>.\n\
+To report a bug, please use the fleang(1) utility.\n");
 
 static const char *Notice = N_("\
 Copyright (C) 1996-2002 Michael R. Elkins and others.\n\
-Mutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.\n\
+Mutt comes with ABSOLUTELY NO WARRANTY; for details type `muttng -vv'.\n\
 Mutt is free software, and you are welcome to redistribute it\n\
-under certain conditions; type `mutt -vv' for details.\n");
+under certain conditions; type `muttng -vv' for details.\n");
 
 static const char *Copyright = N_("\
 Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>\n\
@@ -65,6 +70,7 @@ Copyright (C) 1998-2002 Werner Koch <wk@isil.d.shuttle.de>\n\
 Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n\
 Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n\
 Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n\
+Copyright (C) 2004-2005 Andreas Krennmair <ak@synflood.at>\n\
 \n\
 Lots of others not mentioned here contributed lots of code,\n\
 fixes, and suggestions.\n\
@@ -95,12 +101,12 @@ static void mutt_usage (void)
   puts (mutt_make_version ());
 
   puts _(
-"usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f <file> ]\n\
-       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] [...]\n\
-       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] [...]\n\
-       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] [ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n\
-       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n\
-       mutt -v[v]\n\
+"usage: muttng [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f <file> ]\n\
+       muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] [...]\n\
+       muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] [...]\n\
+       muttng [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] [ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n\
+       muttng [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n\
+       muttng -v[v]\n\
 \n\
 options:\n\
   -A <alias>\texpand the given alias\n\
@@ -112,8 +118,8 @@ options:\n\
   -F <file>\tspecify an alternate muttrc file\n\
   -g <server>\tspecify a newsserver (if compiled with NNTP)\n\
   -G\t\tselect a newsgroup (if compiled with NNTP)\n\
-  -H <file>\tspecify a draft file to read header from\n\
-  -i <file>\tspecify a file which Mutt should include in the reply\n\
+  -H <file>\tspecify a draft file to read header and body from\n\
+  -i <file>\tspecify a file which Mutt should include in the body\n\
   -m <type>\tspecify a default mailbox type\n\
   -n\t\tcauses Mutt not to read the system Muttrc\n\
   -p\t\trecall a postponed message\n\
@@ -216,9 +222,15 @@ static void show_version (void)
 #endif
 
 #ifdef USE_FLOCK
-	"+USE_FLOCK"
+	"+USE_FLOCK   "
+#else
+	"-USE_FLOCK   "
+#endif
+	
+#ifdef USE_INODESORT
+	"+USE_INODESORT   "
 #else
-	"-USE_FLOCK"
+	"-USE_INODESORT   "
 #endif
 	);
   puts (
@@ -240,6 +252,12 @@ static void show_version (void)
         "-USE_IMAP  "
 #endif
 
+#ifdef IMAP_EDIT_THREADS
+        "+IMAP_EDIT_THREADS  "
+#else
+        "-IMAP_EDIT_THREADS  "
+#endif
+
 #ifdef USE_GSS
 	"+USE_GSS  "
 #else
@@ -253,6 +271,18 @@ static void show_version (void)
 	"-USE_SSL  "
 #endif
 
+#ifdef USE_GNUTLS
+	"+USE_GNUTLS  "
+#else
+	"-USE_GNUTLS  "
+#endif
+
+#ifdef USE_GNUTLS
+	"+USE_GNUTLS  "
+#else
+	"-USE_GNUTLS  "
+#endif
+
 #ifdef USE_SASL
 	"+USE_SASL  "
 #else
@@ -435,6 +465,18 @@ static void show_version (void)
 	"-HAVE_GETADDRINFO  "
 #endif
 
+#if USE_HCACHE
+	"+USE_HCACHE  "
+#else
+	"-USE_HCACHE  "
+#endif
+
+#if USE_HCACHE
+	"+USE_HCACHE  "
+#else
+	"-USE_HCACHE  "
+#endif
+
 	);
 
 #ifdef ISPELL
@@ -468,6 +510,7 @@ static void start_curses (void)
 #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 */
@@ -698,6 +741,9 @@ int main (int argc, char **argv)
   mutt_init (flags & M_NOSYSRC, commands);
   mutt_free_list (&commands);
 
+  /* Initialize crypto backends.  */
+  crypt_init ();
+
   if (queries)
     return mutt_query_variables (queries);