various rewrites and cleanups.

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

diff --git a/lib-ui/curs_main.c b/lib-ui/curs_main.c
index 600932a..c7d4712 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"
@@ -479,7 +478,7 @@ int mutt_index_menu (void)
           sidebar_draw ();
           mutt_message (_("New mail in this mailbox."));
 
-          if (ml_core.beep_new)
+          if (MCore.beep_new)
             beep ();
         }
         else if (check == M_FLAGS)
@@ -506,7 +505,7 @@ int mutt_index_menu (void)
         menu->redraw |= REDRAW_SIDEBAR;
       }
       if (do_buffy_notify) {
-        if (buffy_notify () && ml_core.beep_new)
+        if (buffy_notify () && MCore.beep_new)
           beep ();
       }
       else
@@ -974,7 +973,7 @@ int mutt_index_menu (void)
         break;
       }
 
-      if (query_quadoption2(ml_core.quit, _("Quit Madmutt?")) == M_YES) {
+      if (query_quadoption2(MCore.quit, _("Quit Madmutt?")) == M_YES) {
         int check;
 
         oldcount = Context ? Context->msgcount : 0;
@@ -1302,7 +1301,7 @@ int mutt_index_menu (void)
       }
 
       if ((menu->menu == MENU_MAIN)
-          && (query_quadoption2(ml_core.quit,
+          && (query_quadoption2(MCore.quit,
                                 _("Exit Madmutt without saving?")) == M_YES))
       {
         if (Context) {
@@ -1994,11 +1993,6 @@ int mutt_index_menu (void)
       menu->redraw = REDRAW_FULL;
       break;
 
-
-    case OP_FORGET_PASSPHRASE:
-      crypt_forget_passphrase ();
-      break;
-
     case OP_GROUP_REPLY:
 
       CHECK_MSGCOUNT;
@@ -2036,13 +2030,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;