X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=4ea396f8759c4cce4ac2247262f747e5961813e5;hp=30148f05ecc752ce9fd856832f6b15babcf366b4;hb=08fa240d29322ece4c7bceebfae6c6d3fb856f0e;hpb=5cfa41634d9a2c2e8bcf392ff0f2ee0c93794b37

diff --git a/main.c b/main.c
index 30148f0..4ea396f 100644
--- a/main.c
+++ b/main.c
@@ -24,12 +24,13 @@
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "mx.h"
 #include "buffy.h"
 #include "sort.h"
 #include <lib-crypt/crypt.h>
-#include "mutt_curses.h"
 #include "keymap.h"
 #include "url.h"
 #include "mutt_idna.h"
@@ -86,14 +87,9 @@ extern int optind;
 #include <openssl/opensslv.h>
 #endif
 
-static const char *ReachingUs = N_("\
-To contact the developers, please mail to <mutt-ng-devel@lists.berlios.de>.\n\
-To visit the Mutt-ng homepage go to http://www.muttng.org.\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-ng comes with ABSOLUTELY NO WARRANTY; for details type `madmutt -vv'.\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");
 
@@ -172,11 +168,11 @@ options:\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 and body from\n\
-  -i <file>\tspecify a file which Mutt-ng should include in the body");
+  -i <file>\tspecify a file which Madmutt should include in the body");
   puts _("\
-  -d <level>\t specify debugging level of Mutt-ng\n\
+  -d <level>\t specify debugging level of Madmutt\n\
   -m <type>\tspecify a default mailbox type\n\
-  -n\t\tcauses Mutt-ng not to read the system Muttngrc\n\
+  -n\t\tcauses Madmutt not to read the system Madmuttrc\n\
   -p\t\trecall a postponed message\n\
   -Q <variable>\tquery a configuration variable\n\
   -R\t\topen mailbox in read-only mode\n\
@@ -459,9 +455,7 @@ static void show_version (void)
   puts ("  -MIXMASTER\n");
 #endif
 
-  puts (_(ReachingUs));
-
-  puts (_("MadMutt is based on Mutt-ng wich was based on Mutt before\n"));
+  puts (_("MadMutt is based on Madmutt wich was based on Mutt before\n"));
 
   exit (0);
 }
@@ -552,8 +546,8 @@ int main (int argc, char **argv)
   SRAND (time (NULL));
   umask (077);
 
-  p_clear(Options, sizeof(Options));
-  p_clear(QuadOptions, sizeof(QuadOptions));
+  p_clear(Options, countof(Options));
+  p_clear(QuadOptions, countof(QuadOptions));
 
 #ifdef USE_NNTP
   while ((i =
@@ -700,7 +694,6 @@ int main (int argc, char **argv)
     puts (_(Copyright_GPL_1));
     puts (_(Copyright_GPL_2));
     puts (_(Copyright_GPL_3));
-    puts (_(ReachingUs));
     exit (0);
   }