#include <lib-ui/sidebar.h>
#include <lib-mx/mx.h>
-#include <lib-crypt/crypt.h>
-
-#include <pop/pop.h>
+#include "pop.h"
#include "curses.h"
#include "menu.h"
#include "mutt.h"
+#include "crypt.h"
#include "pattern.h"
#include "alias.h"
#include "sort.h"
#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.");
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 ();
sidebar_draw ();
mutt_message (_("New mail in this mailbox."));
- if (option (OPTBEEPNEW))
+ if (MCore.beep_new)
beep ();
}
else if (check == M_FLAGS)
menu->redraw |= REDRAW_SIDEBAR;
}
if (do_buffy_notify) {
- if (buffy_notify () && option (OPTBEEPNEW))
+ if (buffy_notify () && MCore.beep_new)
beep ();
}
else
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;
}
if ((menu->menu == MENU_MAIN)
- && (query_quadoption2(ml_core.quit,
+ && (query_quadoption2(MCore.quit,
_("Exit Madmutt without saving?")) == M_YES))
{
if (Context) {
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;
menu->redraw = REDRAW_FULL;
break;
-
- case OP_FORGET_PASSPHRASE:
- crypt_forget_passphrase ();
- break;
-
case OP_GROUP_REPLY:
CHECK_MSGCOUNT;
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;
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:
#ifdef USE_NNTP
/* Close all open NNTP connections */
nntp_logout_all ();
-#endif
-#ifdef USE_SASL
- mutt_sasl_done ();
#endif
}