rework some things with sasl.

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

diff --git a/lib-ui/curs_main.c b/lib-ui/curs_main.c
index bf3c5a1..45c5105 100644 (file)
--- a/lib-ui/curs_main.c
+++ b/lib-ui/curs_main.c
@@ -14,14 +14,13 @@
 
 #include <lib-ui/sidebar.h>
 #include <lib-mx/mx.h>
-#include <lib-crypt/crypt.h>
-
 #include <pop/pop.h>
 
 #include "curses.h"
 #include "menu.h"
 
 #include "mutt.h"
+#include "crypt.h"
 #include "pattern.h"
 #include "alias.h"
 #include "sort.h"
@@ -35,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.");
@@ -2031,13 +2026,6 @@ int mutt_index_menu (void)
       menu->redraw = REDRAW_FULL;
       break;
 
-    case OP_MAIL_KEY:
-      CHECK_ATTACH;
-      ci_send_message (SENDKEY, NULL, NULL, NULL, NULL);
-      menu->redraw = REDRAW_FULL;
-      break;
-
-
     case OP_EXTRACT_KEYS:
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
@@ -2325,9 +2313,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
   }