projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Nico Golde:
[apps/madmutt.git]
/
curs_main.c
diff --git
a/curs_main.c
b/curs_main.c
index
c58b71a
..
14bb552
100644
(file)
--- a/
curs_main.c
+++ b/
curs_main.c
@@
-16,6
+16,10
@@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include "mutt.h"
#include "mutt_curses.h"
#include "mx.h"
#include "mutt.h"
#include "mutt_curses.h"
#include "mx.h"
@@
-385,7
+389,7
@@
static void update_index (MUTTMENU *menu, CONTEXT *ctx, int check,
if (menu->current < 0)
menu->current = ci_first_message ();
if (menu->current < 0)
menu->current = ci_first_message ();
-
+
}
static void resort_index (MUTTMENU *menu)
}
static void resort_index (MUTTMENU *menu)
@@
-533,6
+537,8
@@
int mutt_index_menu (void)
mutt_error _("Mailbox was externally modified. Flags may be wrong.");
else if (check == M_NEW_MAIL)
{
mutt_error _("Mailbox was externally modified. Flags may be wrong.");
else if (check == M_NEW_MAIL)
{
+ /* on new mail: redraw sidebar */
+ draw_sidebar (CurrentMenu);
mutt_message _("New mail in this mailbox.");
if (option (OPTBEEPNEW))
beep ();
mutt_message _("New mail in this mailbox.");
if (option (OPTBEEPNEW))
beep ();
@@
-558,8
+564,10
@@
int mutt_index_menu (void)
{
/* check for new mail in the incoming folders */
oldcount = newcount;
{
/* check for new mail in the incoming folders */
oldcount = newcount;
- if ((newcount = mutt_buffy_check (0)) != oldcount)
+ if ((newcount = mutt_buffy_check (0)) != oldcount)
{
menu->redraw |= REDRAW_STATUS;
menu->redraw |= REDRAW_STATUS;
+ menu->redraw |= REDRAW_SIDEBAR;
+ }
if (do_buffy_notify)
{
if (mutt_buffy_notify () && option (OPTBEEPNEW))
if (do_buffy_notify)
{
if (mutt_buffy_notify () && option (OPTBEEPNEW))
@@
-571,7
+579,7
@@
int mutt_index_menu (void)
if (op != -1)
mutt_curs_set (0);
if (op != -1)
mutt_curs_set (0);
-
+ if (menu->redraw & REDRAW_SIDEBAR) draw_sidebar(menu->menu);
if (menu->redraw & REDRAW_FULL)
{
menu_redraw_full (menu);
if (menu->redraw & REDRAW_FULL)
{
menu_redraw_full (menu);
@@
-605,6
+613,7
@@
int mutt_index_menu (void)
SETCOLOR (MT_COLOR_STATUS);
mutt_paddstr (COLS, buf);
SETCOLOR (MT_COLOR_NORMAL);
SETCOLOR (MT_COLOR_STATUS);
mutt_paddstr (COLS, buf);
SETCOLOR (MT_COLOR_NORMAL);
+ set_buffystats (Context);
menu->redraw &= ~REDRAW_STATUS;
if (option(OPTXTERMSETTITLES))
{
menu->redraw &= ~REDRAW_STATUS;
if (option(OPTXTERMSETTITLES))
{
@@
-1178,6
+1187,9
@@
CHECK_IMAP_ACL(IMAP_ACL_DELETE);
case OP_MAIN_SYNC_FOLDER:
case OP_MAIN_SYNC_FOLDER:
+ if (Context && !Context->msgcount)
+ break;
+
CHECK_MSGCOUNT;
CHECK_VISIBLE;
CHECK_READONLY;
CHECK_MSGCOUNT;
CHECK_VISIBLE;
CHECK_READONLY;
@@
-1392,7
+1404,7
@@
CHECK_IMAP_ACL(IMAP_ACL_DELETE);
if ((menu->menu == MENU_MAIN)
&& (query_quadoption (OPT_QUIT,
if ((menu->menu == MENU_MAIN)
&& (query_quadoption (OPT_QUIT,
- _("Exit Mutt without saving?")) == M_YES))
+ _("Exit Mutt
-ng
without saving?")) == M_YES))
{
if (Context)
{
{
if (Context)
{
@@
-2080,6
+2092,8
@@
CHECK_IMAP_ACL(IMAP_ACL_INSERT);
}
#endif
}
#endif
+ if (option (OPTPGPAUTODEC) && (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED)))
+ mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw);
mutt_edit_message (Context, tag ? NULL : CURHDR);
menu->redraw = REDRAW_FULL;
mutt_edit_message (Context, tag ? NULL : CURHDR);
menu->redraw = REDRAW_FULL;
@@
-2148,7
+2162,9
@@
CHECK_IMAP_ACL(IMAP_ACL_INSERT);
break;
CHECK_MSGCOUNT;
CHECK_VISIBLE;
break;
CHECK_MSGCOUNT;
CHECK_VISIBLE;
- mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw);
+ if (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED))
+ mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw);
+
if (menu->menu == MENU_PAGER)
{
op = OP_DISPLAY_MESSAGE;
if (menu->menu == MENU_PAGER)
{
op = OP_DISPLAY_MESSAGE;
@@
-2360,6
+2376,7
@@
CHECK_IMAP_ACL(IMAP_ACL_DELETE);
case OP_BUFFY_LIST:
mutt_buffy_list ();
case OP_BUFFY_LIST:
mutt_buffy_list ();
+ menu->redraw = REDRAW_FULL;
break;
case OP_VIEW_ATTACHMENTS:
break;
case OP_VIEW_ATTACHMENTS:
@@
-2382,6
+2399,8
@@
CHECK_IMAP_ACL(IMAP_ACL_DELETE);
case OP_SIDEBAR_SCROLL_DOWN:
case OP_SIDEBAR_NEXT:
case OP_SIDEBAR_PREV:
case OP_SIDEBAR_SCROLL_DOWN:
case OP_SIDEBAR_NEXT:
case OP_SIDEBAR_PREV:
+ case OP_SIDEBAR_NEXT_NEW:
+ case OP_SIDEBAR_PREV_NEW:
scroll_sidebar(op, menu->menu);
break;
default:
scroll_sidebar(op, menu->menu);
break;
default: