fix regression. make the hook types be ints.

[apps/madmutt.git] / main.c

diff --git a/main.c b/main.c
index 06a8a6f..32669b1 100644 (file)
--- a/main.c
+++ b/main.c
@@ -28,7 +28,7 @@
 #include "mx.h"
 #include "buffy.h"
 #include "sort.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 #include "mutt_curses.h"
 #include "keymap.h"
 #include "url.h"
@@ -301,21 +301,11 @@ static void show_version (void)
 #endif
     );
   puts (
-#ifdef USE_POP
-         "  +USE_POP  "
-#else
-         "  -USE_POP  "
-#endif
 #ifdef USE_NNTP
          "+USE_NNTP  "
 #else
          "-USE_NNTP  "
 #endif
-#ifdef USE_IMAP
-         "+USE_IMAP  "
-#else
-         "-USE_IMAP  "
-#endif
 #ifdef USE_GSS
          "+USE_GSS  "
 #else
@@ -779,10 +769,8 @@ int main (int argc, char **argv)
 
     m_strcpy(fpath, sizeof(fpath), Maildir);
     mutt_expand_path (fpath, sizeof (fpath));
-#ifdef USE_IMAP
     /* we're not connected yet - skip mail folder creation */
     if (mx_get_magic (fpath) != M_IMAP)
-#endif
       if (stat (fpath, &sb) == -1 && errno == ENOENT) {
         snprintf (msg, sizeof (msg), _("%s does not exist. Create it?"),
                   Maildir);