X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=96493be44b807291fa4168a7cc86db7cd3409b22;hp=e3778f592c8d48f2074ca9a46ddf847621e47309;hb=031280cca515ce7949dfef0c6c8265c6112b1e34;hpb=2ce8de509852f47a90f834b3e8d047e054810309

diff --git a/main.c b/main.c
index e3778f5..96493be 100644
--- a/main.c
+++ b/main.c
@@ -20,14 +20,12 @@
 #include <sys/utsname.h>
 
 #include <lib-sys/mutt_signal.h>
-
 #include <lib-mime/mime.h>
-
 #include <lib-ui/curses.h>
+#include <lib-mx/mx.h>
 
 #include "mutt.h"
 #include "alias.h"
-#include "mx.h"
 #include "buffy.h"
 #include "sort.h"
 #include <lib-crypt/crypt.h>
@@ -78,47 +76,11 @@ extern int optind;
 
 static const char *Notice = N_("\
 Copyright (C) 1996-2002 Michael R. Elkins and others.\n\
-Madmutt comes with ABSOLUTELY NO WARRANTY; for details type `madmutt -vv'.\n\
-Mutt is free software, and you are welcome to redistribute it\n\
-under certain conditions; type `madmutt -vv' for details.\n");
-
-static const char *Copyright_Mutt = N_("\
-Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n\
-Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n\
-Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n\
-Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n\
-Copyright (C) 1999-2005 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");
-
-static const char *Copyright_Mutt_NG = N_("\
-Copyright (C) 2005:\n\
-  Parts were written/modified by:\n\
-     Andreas Krennmair <ak@synflood.at>\n\
-     Nico Golde <nico@ngolde.de>\n\
-     Rocco Rutte <pdmef@cs.tu-berlin.de>\n\
-\n\
-Lots of others not mentioned here contributed lots of code,\n\
-fixes, and suggestions.");
-
-static const char* Copyright_GPL_1 = N_("\
-\n\
-    This program is free software; you can redistribute it and/or modify\n\
-    it under the terms of the GNU General Public License as published by\n\
-    the Free Software Foundation; either version 2 of the License, or\n\
-    (at your option) any later version.\n");
-
-static const char* Copyright_GPL_2 = N_("\
-    This program is distributed in the hope that it will be useful,\n\
-    but WITHOUT ANY WARRANTY; without even the implied warranty of\n\
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n\
-    GNU General Public License for more details.\n");
-
-static const char* Copyright_GPL_3 = N_("\
-    You should have received a copy of the GNU General Public License\n\
-    along with this program; if not, write to the Free Software\n\
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n\
-");
+Copyright (C) 2005 The Mutt-ng Team\n\
+Copyright (C) 2006 Pierre Habouzit undation, Inc.\n\
+This is free software.  You may redistribute copies of it under the terms of\n\
+the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n\
+There is NO WARRANTY, to the extent permitted by law.\n");
 
 void mutt_exit (int code)
 {
@@ -140,7 +102,7 @@ static void mutt_usage (void)
        madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -T\n\
        madmutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] [ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n\
        madmutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n\
-       madmutt -v[v]\n\
+       madmutt -v\n\
 \n\
 options:\n\
   -A <alias>\texpand the given alias\n\
@@ -254,11 +216,6 @@ static void show_version (void)
 #else
          "-USE_SETGID  "
 #endif
-#ifdef USE_DOTLOCK
-         "+USE_DOTLOCK  "
-#else
-         "-USE_DOTLOCK  "
-#endif
 #ifdef USE_FCNTL
          "+USE_FCNTL  "
 #else
@@ -356,11 +313,6 @@ static void show_version (void)
          "+CRYPT_BACKEND_GPGME  "
 #else
          "-CRYPT_BACKEND_GPGME  "
-#endif
-#ifdef BUFFY_SIZE
-         "+BUFFY_SIZE "
-#else
-         "-BUFFY_SIZE "
 #endif
          "\n  "
 #ifdef ENABLE_NLS
@@ -637,20 +589,8 @@ int main (int argc, char **argv)
       mutt_usage ();
     }
 
-  switch (version) {
-  case 0:
-    break;
-  case 1:
+  if (version) {
     show_version ();
-    break;
-  default:
-    puts (mutt_make_version (1));
-    puts (_(Copyright_Mutt));
-    puts (_(Copyright_Mutt_NG));
-    puts (_(Copyright_GPL_1));
-    puts (_(Copyright_GPL_2));
-    puts (_(Copyright_GPL_3));
-    exit (0);
   }
 
   /* Check for a batch send. */
@@ -870,7 +810,7 @@ int main (int argc, char **argv)
       }
       else
 #endif
-      if (!Incoming) {
+      if (!Incoming.len) {
         mutt_endwin _("No incoming mailboxes defined.");
 
         exit (1);