always build imap as well.

[apps/madmutt.git] / curs_main.c

diff --git a/curs_main.c b/curs_main.c
index 9905ed5..c241ff6 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -33,9 +33,7 @@
 #include "thread.h"
 #include "xterm.h"
 
-#ifdef USE_IMAP
-#include "imap_private.h"
-#endif
+#include <imap/imap_private.h>
 
 #include "mutt_crypt.h"
 
@@ -470,9 +468,7 @@ int mutt_index_menu (void)
        * modified underneath us.)
        */
 
-#ifdef USE_IMAP
       imap_allow_reopen (Context);
-#endif
 
       index_hint = (Context->vcount && menu->current >= 0
                     && menu->current < Context->vcount) ? CURHDR->index : 0;
@@ -513,10 +509,8 @@ int mutt_index_menu (void)
       }
     }
 
-#ifdef USE_IMAP
     imap_keepalive ();
     imap_disallow_reopen (Context);
-#endif
 
     if (!attach_msg) {
       /* check for new mail in the incoming folders */
@@ -1101,12 +1095,10 @@ int mutt_index_menu (void)
        * The following operations can be performed inside of the pager.
        */
 
-#ifdef USE_IMAP
     case OP_MAIN_IMAP_FETCH:
       if (Context->magic == M_IMAP)
         imap_check_mailbox (Context, &index_hint, 1);
       break;
-#endif
 
     case OP_MAIN_SYNC_FOLDER:
 
@@ -2092,14 +2084,12 @@ int mutt_index_menu (void)
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       mutt_pipe_message (tag ? NULL : CURHDR);
-#ifdef USE_IMAP
       /* in an IMAP folder index with imap_peek=no, piping could change
        * * new or old messages status to read. Redraw what's needed.
        */
       if (Context->magic == M_IMAP && !option (OPTIMAPPEEK)) {
         menu->redraw = (tag ? REDRAW_INDEX : REDRAW_CURRENT) | REDRAW_STATUS;
       }
-#endif
       MAYBE_REDRAW (menu->redraw);
       break;
 
@@ -2108,14 +2098,12 @@ int mutt_index_menu (void)
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       mutt_print_message (tag ? NULL : CURHDR);
-#ifdef USE_IMAP
       /* in an IMAP folder index with imap_peek=no, piping could change
        * * new or old messages status to read. Redraw what's needed.
        */
       if (Context->magic == M_IMAP && !option (OPTIMAPPEEK)) {
         menu->redraw = (tag ? REDRAW_INDEX : REDRAW_CURRENT) | REDRAW_STATUS;
       }
-#endif
       break;
 
     case OP_MAIN_READ_THREAD:
@@ -2356,10 +2344,8 @@ int mutt_index_menu (void)
   }
 
   if (!attach_msg) {
-#ifdef USE_IMAP
   /* Close all open IMAP connections */
     imap_logout_all ();
-#endif
 #ifdef USE_NNTP
   /* Close all open NNTP connections */
     nntp_logout_all ();