#include "mutt_curses.h"
#include "mx.h"
#include "mutt_menu.h"
-#include "mailbox.h"
#include "mapping.h"
#include "sort.h"
#include "buffy.h"
#include "nntp.h"
#endif
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
#include <ctype.h>
#include <stdlib.h>
mutt_buffy_check (1); /* force the buffy check after we enter the folder */
/* record folder we open to place sidebar indicator properly */
if (Context && Context->path)
- set_curbuffy (Context->path);
+ sidebar_set_current (Context->path);
}
FOREVER {
("Mailbox was externally modified. Flags may be wrong."));
else if (check == M_NEW_MAIL) {
/* on new mail: redraw sidebar */
- draw_sidebar (CurrentMenu);
+ sidebar_draw (CurrentMenu);
mutt_message (_("New mail in this mailbox."));
if (option (OPTBEEPNEW))
if (op != -1)
mutt_curs_set (0);
if (menu->redraw & REDRAW_SIDEBAR)
- draw_sidebar (menu->menu);
+ sidebar_draw (menu->menu);
if (menu->redraw & REDRAW_FULL) {
menu_redraw_full (menu);
- draw_sidebar (menu->menu);
+ sidebar_draw (menu->menu);
mutt_show_error ();
}
SETCOLOR (MT_COLOR_STATUS);
mutt_paddstr (COLS, buf);
SETCOLOR (MT_COLOR_NORMAL);
- set_buffystats (Context);
+ sidebar_set_buffystats (Context);
menu->redraw &= ~REDRAW_STATUS;
if (option (OPTXTERMSETTITLES)) {
menu_status_line (buf, sizeof (buf), menu, NONULL (XtermTitle));
}
if (op == OP_SIDEBAR_OPEN) {
- if (!CurBuffy)
- break;
- strncpy (buf, CurBuffy->path, sizeof (buf));
+ strncpy (buf, NONULL(sidebar_get_current ()), sizeof (buf));
}
else if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) ==
-1)
else
#endif
mutt_expand_path (buf, sizeof (buf));
- set_curbuffy (buf);
+ sidebar_set_current (buf);
if (mx_get_magic (buf) <= 0) {
mutt_error (_("%s is not a mailbox."), buf);
break;
}
- mutt_str_replace (&CurrentFolder, buf);
+ str_replace (&CurrentFolder, buf);
if (Context) {
int check;
#ifdef USE_COMPRESSED
if (Context->compressinfo && Context->realpath)
- mutt_str_replace (&LastFolder, Context->realpath);
+ str_replace (&LastFolder, Context->realpath);
else
#endif
- mutt_str_replace (&LastFolder, Context->path);
+ str_replace (&LastFolder, Context->path);
oldcount = Context ? Context->msgcount : 0;
if ((check = mx_close_mailbox (Context, &index_hint)) != 0) {
sleep (2);
}
else if (op != OP_FOLLOWUP || !CURHDR->env->followup_to ||
- mutt_strcasecmp (CURHDR->env->followup_to, "poster") ||
+ safe_strcasecmp (CURHDR->env->followup_to, "poster") ||
query_quadoption (OPT_FOLLOWUPTOPOSTER,
_("Reply by mail as poster prefers?")) !=
M_YES) {
case OP_SIDEBAR_PREV:
case OP_SIDEBAR_NEXT_NEW:
case OP_SIDEBAR_PREV_NEW:
- scroll_sidebar (op, menu->menu);
+ sidebar_scroll (op, menu->menu);
break;
default:
if (menu->menu == MENU_MAIN)