projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
missing bits.
[apps/madmutt.git]
/
lib-ui
/
curs_main.c
diff --git
a/lib-ui/curs_main.c
b/lib-ui/curs_main.c
index
f9e7c33
..
31c11bf
100644
(file)
--- a/
lib-ui/curs_main.c
+++ b/
lib-ui/curs_main.c
@@
-14,20
+14,20
@@
#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 "curses.h"
#include "menu.h"
#include "mutt.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"
#include "recvattach.h"
#include "buffy.h"
#include "thread.h"
#include "pattern.h"
#include "alias.h"
#include "sort.h"
#include "recvattach.h"
#include "buffy.h"
#include "thread.h"
+#include "mutt_sasl.h"
#include <imap/imap_private.h>
#include <imap/imap_private.h>
@@
-35,10
+35,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.");
@@
-97,12
+93,14
@@
extern size_t UngetCount;
void index_make_entry (char *s, ssize_t l, struct menu_t * menu, int num)
{
void index_make_entry (char *s, ssize_t l, struct menu_t * menu, int num)
{
- format_flag flag =
- M_FORMAT_MAKEPRINT | M_FORMAT_ARROWCURSOR | M_FORMAT_INDEX;
+ format_flag flag = M_FORMAT_MAKEPRINT | M_FORMAT_INDEX;
int edgemsgno, reverse = Sort & SORT_REVERSE;
HEADER *h = Context->hdrs[Context->v2r[num]];
THREAD *tmp;
int edgemsgno, reverse = Sort & SORT_REVERSE;
HEADER *h = Context->hdrs[Context->v2r[num]];
THREAD *tmp;
+ if (option(OPTARROWCURSOR))
+ flag |= M_FORMAT_ARROWCURSOR;
+
if ((Sort & SORT_MASK) == SORT_THREADS && h->tree) {
flag |= M_FORMAT_TREE; /* display the thread tree */
if (h->display_subject)
if ((Sort & SORT_MASK) == SORT_THREADS && h->tree) {
flag |= M_FORMAT_TREE; /* display the thread tree */
if (h->display_subject)
@@
-477,7
+475,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)
@@
-504,7
+502,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
@@
-972,7
+970,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;
@@
-1300,7
+1298,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) {
@@
-1992,11
+1990,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;
@@
-2034,13
+2027,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;
@@
-2329,9
+2315,7
@@
int mutt_index_menu (void)
/* Close all open NNTP connections */
nntp_logout_all ();
#endif
/* Close all open NNTP connections */
nntp_logout_all ();
#endif
-#ifdef USE_SASL
mutt_sasl_done ();
mutt_sasl_done ();
-#endif
}
mutt_menuDestroy (&menu);
}
mutt_menuDestroy (&menu);