move signal.c into lib/sys

[apps/madmutt.git] / main.c

diff --git a/main.c b/main.c
index 29197df..4a735ef 100644 (file)
--- a/main.c
+++ b/main.c
@@ -33,6 +33,8 @@
 #include <lib-lib/file.h>
 #include <lib-lib/debug.h>
 
+#include <lib-sys/mutt_signal.h>
+
 #include <lib-ui/curses.h>
 
 #include "mutt.h"
@@ -330,11 +332,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 +467,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 ();