X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=cc432d924b87c758346ab04b22307ff2f12fd9e2;hp=72166ea0fd8b1a4fcf306a98072db496319a6746;hb=049b21f53af51ad7259613f5eefaa0f37b1b2167;hpb=c81a65db2499a363af5af28610db5f7e69e15839

diff --git a/main.c b/main.c
index 72166ea..cc432d9 100644
--- a/main.c
+++ b/main.c
@@ -21,6 +21,7 @@
 
 #include <lib-lua/lib-lua.h>
 #include <lib-sys/mutt_signal.h>
+#include <lib-sys/evtloop.h>
 #include <lib-mime/mime.h>
 #include <lib-ui/lib-ui.h>
 #include <lib-mx/mx.h>
@@ -46,8 +47,8 @@ extern int optind;
 #endif
 
 #ifdef USE_HCACHE
-#if defined(HAVE_QDBM)
-#include <depot.h>
+#if defined(HAVE_TOKYOCABINET)
+#include <tcutil.h>
 #elif defined(HAVE_GDBM)
 #include <gdbm.h>
 #endif
@@ -56,6 +57,8 @@ extern int optind;
 #include <gnutls/gnutls.h>
 #include <gpgme.h>
 
+#include <libintl.h>
+
 void mutt_exit(int code)
 {
     mutt_endwin(NULL);
@@ -64,7 +67,7 @@ void mutt_exit(int code)
 
 static void mutt_usage (void)
 {
-    puts(mutt_make_version());
+    puts(madmutt_version);
 
     puts(_("\
 usage: madmutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -f <file> ]\n\
@@ -98,7 +101,7 @@ static void show_version (void)
     struct utsname uts;
     uname(&uts);
 
-    puts(mutt_make_version());
+    puts(madmutt_version);
     puts(_("  Copyright (C) 1996-2002 Michael R. Elkins and others."));
     puts(_("  Copyright (C) 2005      The Mutt-ng Team"));
     puts(_("  Copyright (C) 2006-2007 Pierre Habouzit"));
@@ -118,8 +121,8 @@ static void show_version (void)
     printf("  libidn %s\n", STRINGPREP_VERSION);
 #endif
 #ifdef USE_HCACHE
-#if defined(HAVE_QDBM)
-    printf("  qdbm %s\n", dpversion);
+#if defined(HAVE_TOKYOCABINET)
+    printf("  tokyocabinet %s\n", tcversion);
 #elif defined(HAVE_GDBM)
     printf("  gdbm %s\n", gdbm_version);
 #endif
@@ -129,16 +132,6 @@ static void show_version (void)
     puts (_("Compile Options:"));
 
     puts (
-#ifdef USE_FCNTL
-        "  +USE_FCNTL"
-#else
-        "  -USE_FCNTL"
-#endif
-#ifdef USE_FLOCK
-        "  +USE_FLOCK"
-#else
-        "  -USE_FLOCK"
-#endif
 #ifdef USE_HCACHE
         "  +USE_HCACHE"
 #else
@@ -311,6 +304,7 @@ int main (int argc, char **argv)
   }
 
   /* set defaults and read init files */
+  el_initialize();
   mutt_init (flags & M_NOSYSRC, commands);
   string_list_wipe(&commands);
 
@@ -498,6 +492,7 @@ int main (int argc, char **argv)
                                    NULL)) || !explicit_folder)
     {
       mutt_index_menu ();
+
       if (option (OPTXTERMSETTITLES))
         printf("\033]2;%s\007", NONULL(XtermLeave));
       if (Context)
@@ -508,5 +503,6 @@ int main (int argc, char **argv)
 
   luaM_shutdown();
   mutt_sasl_shutdown();
+  el_shutdown();
   exit (0);
 }