simplify pop_query, letting it do the snprintf and append \r\n

[apps/madmutt.git] / lib-ui / curs_main.c

diff --git a/lib-ui/curs_main.c b/lib-ui/curs_main.c
index 31c11bf..82eb7e4 100644 (file)
--- 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"
@@ -27,7 +27,6 @@
 #include "recvattach.h"
 #include "buffy.h"
 #include "thread.h"
-#include "mutt_sasl.h"
 
 #include <imap/imap_private.h>
 
@@ -1743,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;
@@ -2282,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:
@@ -2315,7 +2309,6 @@ int mutt_index_menu (void)
   /* Close all open NNTP connections */
     nntp_logout_all ();
 #endif
-    mutt_sasl_done ();
   }
 
   mutt_menuDestroy (&menu);