X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=4ea57e15456a5efe74be3241c1fcabe8ae851482;hp=29197df2867c15b2c19c79735ec82a7d3179ad77;hb=0f6739c5be4203bec0fa32962e6ab13349da703b;hpb=05a3bbbe420e4afc76e0eea24ce32f859405dc4a

diff --git a/main.c b/main.c
index 29197df..4ea57e1 100644
--- a/main.c
+++ b/main.c
@@ -32,6 +32,11 @@
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
 #include <lib-lib/debug.h>
+#include <lib-lib/url.h>
+
+#include <lib-sys/mutt_signal.h>
+
+#include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>
 
@@ -41,7 +46,6 @@
 #include "sort.h"
 #include <lib-crypt/crypt.h>
 #include "keymap.h"
-#include "url.h"
 #include "mutt_idna.h"
 #include "xterm.h"
 
@@ -330,11 +334,6 @@ static void show_version (void)
          "+HAVE_REGCOMP  "
 #else
          "-HAVE_REGCOMP  "
-#endif
-#ifdef USE_GNU_REGEX
-         "+USE_GNU_REGEX  "
-#else
-         "-USE_GNU_REGEX  "
 #endif
          "\n  "
 #ifdef HAVE_COLOR
@@ -470,17 +469,14 @@ static void start_curses (void)
 #else
   /* should come before initscr() so that ncurses 4.2 doesn't try to install
      its own SIGWINCH handler */
-  mutt_signal_init ();
+  mutt_signal_initialize ();
 #endif
   if (initscr () == NULL) {
     puts _("Error initializing terminal.");
 
     exit (1);
   }
-#if 1                           /* USE_SLANG_CURSES  - commenting out suggested in #455. */
-  /* slang requires the signal handlers to be set after initializing */
-  mutt_signal_init ();
-#endif
+  mutt_signal_initialize ();
   ci_start_color ();
   keypad (stdscr, TRUE);
   cbreak ();
@@ -725,7 +721,7 @@ int main (int argc, char **argv)
     address_t *a;
 
     for (; alias_queries; alias_queries = alias_queries->next) {
-      if ((a = mutt_lookup_alias (alias_queries->data))) {
+      if ((a = alias_lookup(Aliases, alias_queries->data))) {
         /* output in machine-readable form */
         mutt_addrlist_to_idna (a, NULL);
         mutt_write_address_list (a, stdout, 0, 0);