X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fcurs_main.c;h=799d08b122b1373d020d2596122cdd5ff62669d4;hp=c7d47128f5dce9b0838b06f962058ec8c672f836;hb=785bb3cb4dd83ec1071998a64af74e333d076347;hpb=c8e9242de36d7aa6e3bb2e446f57ef2a14e4c889

diff --git a/lib-ui/curs_main.c b/lib-ui/curs_main.c
index c7d4712..799d08b 100644
--- a/lib-ui/curs_main.c
+++ b/lib-ui/curs_main.c
@@ -14,7 +14,7 @@
 
 #include <lib-ui/sidebar.h>
 #include <lib-mx/mx.h>
-#include <pop/pop.h>
+#include "pop.h"
 
 #include "curses.h"
 #include "menu.h"
@@ -34,10 +34,6 @@
 #include <nntp/nntp.h>
 #endif
 
-#ifdef USE_SASL
-#include "mutt_sasl.h"
-#endif
-
 static const char *No_mailbox_is_open = N_("No mailbox is open.");
 static const char *There_are_no_messages = N_("There are no messages.");
 static const char *Mailbox_is_read_only = N_("Mailbox is read-only.");
@@ -397,10 +393,10 @@ int mutt_index_menu (void)
   int oldcount = -1;
   int rc = -1;
   MUTTMENU *menu;
-  char *cp;                     /* temporary variable. */
+  const char *cp;               /* temporary variable. */
   int index_hint;               /* used to restore cursor position */
   int do_buffy_notify = 1;
-  int closed = 0;                /* did we OP_QUIT or OP_EXIT out of this menu? */
+  int closed = 0;               /* did we OP_QUIT or OP_EXIT out of this menu? */
   int attach_msg = option (OPTATTACHMSG);
 
   menu = mutt_new_menu ();
@@ -1746,8 +1742,7 @@ int mutt_index_menu (void)
       CHECK_VISIBLE;
       CHECK_READONLY;
 
-      if (mutt_change_flag (tag ? NULL : CURHDR, (op == OP_MAIN_SET_FLAG)) ==
-          0) {
+      if (mutt_change_flag (tag ? NULL : CURHDR, (op == OP_MAIN_SET_FLAG)) == 0) {
         menu->redraw = REDRAW_STATUS;
         if (tag)
           menu->redraw |= REDRAW_INDEX;
@@ -2285,10 +2280,6 @@ int mutt_index_menu (void)
       mutt_what_key ();
       break;
 
-    case OP_REBUILD_CACHE:
-      mx_rebuild_cache ();
-      break;
-
     case OP_SIDEBAR_SCROLL_UP:
     case OP_SIDEBAR_SCROLL_DOWN:
     case OP_SIDEBAR_NEXT:
@@ -2317,9 +2308,6 @@ int mutt_index_menu (void)
 #ifdef USE_NNTP
   /* Close all open NNTP connections */
     nntp_logout_all ();
-#endif
-#ifdef USE_SASL
-    mutt_sasl_done ();
 #endif
   }