projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix warnings.
[apps/madmutt.git]
/
lib-ui
/
curs_main.c
diff --git
a/lib-ui/curs_main.c
b/lib-ui/curs_main.c
index
71af8bd
..
799d08b
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-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 "curses.h"
#include "menu.h"
#include "mutt.h"
+#include "crypt.h"
#include "pattern.h"
#include "alias.h"
#include "sort.h"
#include "pattern.h"
#include "alias.h"
#include "sort.h"
@@
-35,10
+34,6
@@
#include <nntp/nntp.h>
#endif
#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.");
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.");
@@
-398,10
+393,10
@@
int mutt_index_menu (void)
int oldcount = -1;
int rc = -1;
MUTTMENU *menu;
int oldcount = -1;
int rc = -1;
MUTTMENU *menu;
- c
har *cp;
/* temporary variable. */
+ c
onst char *cp;
/* temporary variable. */
int index_hint; /* used to restore cursor position */
int do_buffy_notify = 1;
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 ();
int attach_msg = option (OPTATTACHMSG);
menu = mutt_new_menu ();
@@
-479,7
+474,7
@@
int mutt_index_menu (void)
sidebar_draw ();
mutt_message (_("New mail in this mailbox."));
sidebar_draw ();
mutt_message (_("New mail in this mailbox."));
- if (
option (OPTBEEPNEW)
)
+ if (
MCore.beep_new
)
beep ();
}
else if (check == M_FLAGS)
beep ();
}
else if (check == M_FLAGS)
@@
-506,7
+501,7
@@
int mutt_index_menu (void)
menu->redraw |= REDRAW_SIDEBAR;
}
if (do_buffy_notify) {
menu->redraw |= REDRAW_SIDEBAR;
}
if (do_buffy_notify) {
- if (buffy_notify () &&
option (OPTBEEPNEW)
)
+ if (buffy_notify () &&
MCore.beep_new
)
beep ();
}
else
beep ();
}
else
@@
-974,7
+969,7
@@
int mutt_index_menu (void)
break;
}
break;
}
- if (query_quadoption
(OPT_QUIT
, _("Quit Madmutt?")) == M_YES) {
+ if (query_quadoption
2(MCore.quit
, _("Quit Madmutt?")) == M_YES) {
int check;
oldcount = Context ? Context->msgcount : 0;
int check;
oldcount = Context ? Context->msgcount : 0;
@@
-1302,7
+1297,7
@@
int mutt_index_menu (void)
}
if ((menu->menu == MENU_MAIN)
}
if ((menu->menu == MENU_MAIN)
- && (query_quadoption
(OPT_QUIT
,
+ && (query_quadoption
2(MCore.quit
,
_("Exit Madmutt without saving?")) == M_YES))
{
if (Context) {
_("Exit Madmutt without saving?")) == M_YES))
{
if (Context) {
@@
-1747,8
+1742,7
@@
int mutt_index_menu (void)
CHECK_VISIBLE;
CHECK_READONLY;
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_STATUS;
if (tag)
menu->redraw |= REDRAW_INDEX;
@@
-1994,11
+1988,6
@@
int mutt_index_menu (void)
menu->redraw = REDRAW_FULL;
break;
menu->redraw = REDRAW_FULL;
break;
-
- case OP_FORGET_PASSPHRASE:
- crypt_forget_passphrase ();
- break;
-
case OP_GROUP_REPLY:
CHECK_MSGCOUNT;
case OP_GROUP_REPLY:
CHECK_MSGCOUNT;
@@
-2036,13
+2025,6
@@
int mutt_index_menu (void)
menu->redraw = REDRAW_FULL;
break;
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;
case OP_EXTRACT_KEYS:
CHECK_MSGCOUNT;
CHECK_VISIBLE;
@@
-2298,10
+2280,6
@@
int mutt_index_menu (void)
mutt_what_key ();
break;
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:
case OP_SIDEBAR_SCROLL_UP:
case OP_SIDEBAR_SCROLL_DOWN:
case OP_SIDEBAR_NEXT:
@@
-2330,9
+2308,6
@@
int mutt_index_menu (void)
#ifdef USE_NNTP
/* Close all open NNTP connections */
nntp_logout_all ();
#ifdef USE_NNTP
/* Close all open NNTP connections */
nntp_logout_all ();
-#endif
-#ifdef USE_SASL
- mutt_sasl_done ();
#endif
}
#endif
}