projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
further pop_mx_ng work
[apps/madmutt.git]
/
main.c
diff --git
a/main.c
b/main.c
index
afa5ef8
..
cc432d9
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-21,6
+21,7
@@
#include <lib-lua/lib-lua.h>
#include <lib-sys/mutt_signal.h>
#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>
#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
#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
#elif defined(HAVE_GDBM)
#include <gdbm.h>
#endif
@@
-56,6
+57,8
@@
extern int optind;
#include <gnutls/gnutls.h>
#include <gpgme.h>
#include <gnutls/gnutls.h>
#include <gpgme.h>
+#include <libintl.h>
+
void mutt_exit(int code)
{
mutt_endwin(NULL);
void mutt_exit(int code)
{
mutt_endwin(NULL);
@@
-118,8
+121,8
@@
static void show_version (void)
printf(" libidn %s\n", STRINGPREP_VERSION);
#endif
#ifdef USE_HCACHE
printf(" libidn %s\n", STRINGPREP_VERSION);
#endif
#ifdef USE_HCACHE
-#if defined(HAVE_
QDBM
)
- printf("
qdbm %s\n", dp
version);
+#if defined(HAVE_
TOKYOCABINET
)
+ printf("
tokyocabinet %s\n", tc
version);
#elif defined(HAVE_GDBM)
printf(" gdbm %s\n", gdbm_version);
#endif
#elif defined(HAVE_GDBM)
printf(" gdbm %s\n", gdbm_version);
#endif
@@
-129,16
+132,6
@@
static void show_version (void)
puts (_("Compile Options:"));
puts (
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
#ifdef USE_HCACHE
" +USE_HCACHE"
#else
@@
-311,6
+304,7
@@
int main (int argc, char **argv)
}
/* set defaults and read init files */
}
/* set defaults and read init files */
+ el_initialize();
mutt_init (flags & M_NOSYSRC, commands);
string_list_wipe(&commands);
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 ();
NULL)) || !explicit_folder)
{
mutt_index_menu ();
+
if (option (OPTXTERMSETTITLES))
printf("\033]2;%s\007", NONULL(XtermLeave));
if (Context)
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();
luaM_shutdown();
mutt_sasl_shutdown();
+ el_shutdown();
exit (0);
}
exit (0);
}