projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into nohook
[apps/madmutt.git]
/
flags.c
diff --git
a/flags.c
b/flags.c
index
7aa65d4
..
f83d2a3
100644
(file)
--- a/
flags.c
+++ b/
flags.c
@@
-11,7
+11,6
@@
#include <lib-ui/lib-ui.h>
#include <lib-ui/menu.h>
#include <lib-ui/lib-ui.h>
#include <lib-ui/menu.h>
-#include <lib-ui/sidebar.h>
#include <lib-mx/mx.h>
#include "mutt.h"
#include <lib-mx/mx.h>
#include "mutt.h"
@@
-320,6
+319,8
@@
int mutt_thread_set_flag (HEADER * hdr, int flag, int bf, int subthread)
int mutt_change_flag(HEADER * h, int bf)
{
int mutt_change_flag(HEADER * h, int bf)
{
+ char buf[STRING];
+ const char letters[] = "dDnNoOrR*!";
static char const actions[] = {
['d'] = M_DELETE, ['D'] = M_DELETE,
['n'] = M_NEW, ['N'] = M_NEW,
static char const actions[] = {
['d'] = M_DELETE, ['D'] = M_DELETE,
['n'] = M_NEW, ['N'] = M_NEW,
@@
-331,20
+332,12
@@
int mutt_change_flag(HEADER * h, int bf)
int c;
int c;
-
mvwprintw(stdscr, LINES - 1, 0
, "%s? (D/N/O/r/*/!): ",
+
snprintf(buf, sizeof(buf)
, "%s? (D/N/O/r/*/!): ",
bf ? _("Set flag") : _("Clear flag"));
bf ? _("Set flag") : _("Clear flag"));
- wclrtoeol(stdscr);
- c = mutt_getch().ch;
- CLEARLINE(stdscr, LINES - 1);
- if (c == -1) {
- return (-1);
- }
-
- if (c < 0 || c > countof(actions) || !actions[c]) {
- BEEP();
+ c = mutt_multi_choice(buf, letters);
+ if (c <= 0)
return -1;
return -1;
- }
-
+ c = letters[c - 1];
if (actions[c] == M_OLD) {
if (h) {
mutt_set_flag(Context, h, M_READ, !bf);
if (actions[c] == M_OLD) {
if (h) {
mutt_set_flag(Context, h, M_READ, !bf);