generalize the idea of tokens a bit more, don't restrict it to the rfc822

[apps/madmutt.git] / curs_main.c

diff --git a/curs_main.c b/curs_main.c
index 6d8421e..92c6922 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -19,6 +19,8 @@
 #include <lib-lib/macros.h>
 #include <lib-lib/mapping.h>
 
+#include <pop/pop.h>
+
 #include "mutt.h"
 #include "mutt_curses.h"
 #include "mx.h"
@@ -31,15 +33,9 @@
 #include "thread.h"
 #include "xterm.h"
 
-#ifdef USE_POP
-#include "pop.h"
-#endif
-
-#ifdef USE_IMAP
-#include "imap_private.h"
-#endif
+#include <imap/imap_private.h>
 
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 
 #ifdef USE_NNTP
 #include "nntp.h"
@@ -115,7 +111,7 @@ static const char *No_visible = N_("No visible messages.");
 
 extern size_t UngetCount;
 
-void index_make_entry (char *s, size_t l, MUTTMENU * menu, int num)
+void index_make_entry (char *s, ssize_t l, struct menu_t * menu, int num)
 {
   format_flag flag =
     M_FORMAT_MAKEPRINT | M_FORMAT_ARROWCURSOR | M_FORMAT_INDEX;
@@ -472,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;
@@ -515,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 */
@@ -913,14 +905,12 @@ int mutt_index_menu (void)
       menu->redraw = REDRAW_INDEX | REDRAW_STATUS;
       break;
 
-#ifdef USE_POP
     case OP_MAIN_FETCH_MAIL:
 
       CHECK_ATTACH;
       pop_fetch_mail ();
       menu->redraw = REDRAW_FULL;
       break;
-#endif /* USE_POP */
 
     case OP_HELP:
 
@@ -1000,7 +990,7 @@ int mutt_index_menu (void)
         break;
       }
 
-      if (query_quadoption (OPT_QUIT, _("Quit Mutt-ng?")) == M_YES) {
+      if (query_quadoption (OPT_QUIT, _("Quit Madmutt?")) == M_YES) {
         int check;
 
         oldcount = Context ? Context->msgcount : 0;
@@ -1105,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:
 
@@ -1238,12 +1226,9 @@ int mutt_index_menu (void)
       if (Context) {
         int check;
 
-#ifdef USE_COMPRESSED
         if (Context->compressinfo && Context->realpath)
           m_strreplace(&LastFolder, Context->realpath);
         else
-#endif
-
           m_strreplace(&LastFolder, Context->path);
         oldcount = Context ? Context->msgcount : 0;
 
@@ -1334,7 +1319,7 @@ int mutt_index_menu (void)
 
       if ((menu->menu == MENU_MAIN)
           && (query_quadoption (OPT_QUIT,
-                                _("Exit Mutt-ng without saving?")) == M_YES))
+                                _("Exit Madmutt without saving?")) == M_YES))
       {
         if (Context) {
           mx_fastclose_mailbox (Context);
@@ -1512,9 +1497,6 @@ int mutt_index_menu (void)
 
     case OP_DECRYPT_COPY:
     case OP_DECRYPT_SAVE:
-      if (!WithCrypto)
-        break;
-      /* fall thru */
     case OP_COPY_MESSAGE:
     case OP_SAVE:
     case OP_DECODE_COPY:
@@ -2071,8 +2053,6 @@ int mutt_index_menu (void)
       break;
 
     case OP_MAIL_KEY:
-      if (!(WithCrypto & APPLICATION_PGP))
-        break;
       CHECK_ATTACH;
       ci_send_message (SENDKEY, NULL, NULL, NULL, NULL);
       menu->redraw = REDRAW_FULL;
@@ -2080,8 +2060,6 @@ int mutt_index_menu (void)
 
 
     case OP_EXTRACT_KEYS:
-      if (!WithCrypto)
-        break;
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       crypt_extract_keys_from_messages (tag ? NULL : CURHDR);
@@ -2090,8 +2068,6 @@ int mutt_index_menu (void)
 
 
     case OP_CHECK_TRADITIONAL:
-      if (!(WithCrypto & APPLICATION_PGP))
-        break;
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       if (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED))
@@ -2108,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;
 
@@ -2124,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:
@@ -2372,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 ();