#include <pwd.h>
#include <grp.h>
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
#include <lib-ui/enter.h>
#include <lib-ui/menu.h>
#include <lib-ui/sidebar.h>
#include "nntp.h"
#endif
-static struct mapping_t FolderHelp[] = {
- {N_("Exit"), OP_EXIT},
- {N_("Chdir"), OP_CHANGE_DIRECTORY},
- {N_("Mask"), OP_ENTER_MASK},
- {N_("Help"), OP_HELP},
- {NULL, OP_NULL}
-};
-
-#ifdef USE_NNTP
-static struct mapping_t FolderNewsHelp[] = {
- {N_("Exit"), OP_EXIT},
- {N_("List"), OP_TOGGLE_MAILBOXES},
- {N_("Subscribe"), OP_BROWSER_SUBSCRIBE},
- {N_("Unsubscribe"), OP_BROWSER_UNSUBSCRIBE},
- {N_("Catchup"), OP_CATCHUP},
- {N_("Mask"), OP_ENTER_MASK},
- {N_("Help"), OP_HELP},
- {NULL, OP_NULL}
-};
-#endif
-
typedef struct folder_t {
struct folder_file *ff;
int num;
snprintf (dest, destlen, tmp, Context->new);
}
else if (option (OPTMARKOLD) &&
- folder->ff->nd->lastCached >= folder->ff->nd->firstMessage &&
- folder->ff->nd->lastCached <= folder->ff->nd->lastMessage) {
+ folder->ff->nd->lastCached >= folder->ff->nd->first &&
+ folder->ff->nd->lastCached <= folder->ff->nd->last) {
snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
snprintf (dest, destlen, tmp,
- folder->ff->nd->lastMessage - folder->ff->nd->lastCached);
+ folder->ff->nd->last - folder->ff->nd->lastCached);
}
else {
snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
#ifdef USE_NNTP
if (option (OPTNEWS)) {
nntp_data_t *data;
- NNTP_SERVER *news = CurrentNewsSrv;
+ nntp_server_t *news = CurrentNewsSrv;
/* buffy_check (0); */
init_state (state, menu);
#ifdef USE_NNTP
if (option (OPTNEWS)) {
nntp_data_t *data;
- NNTP_SERVER *news = CurrentNewsSrv;
+ nntp_server_t *news = CurrentNewsSrv;
/* buffy_check (0); */
init_state (state, menu);
{
char buf[_POSIX_PATH_MAX];
char prefix[_POSIX_PATH_MAX] = "";
- char helpstr[STRING];
char title[STRING];
struct browser_state state;
MUTTMENU *menu;
menu->data = state.entry;
if (multiple)
menu->tag = file_tag;
-
- menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_FOLDER,
-#ifdef USE_NNTP
- (option (OPTNEWS)) ? FolderNewsHelp :
-#endif
- FolderHelp);
-
init_menu (&state, menu, title, sizeof (title), buffy);
for (;;) {
char *s = buf;
int j = menu->current;
nntp_data_t *nd;
- NNTP_SERVER *news = CurrentNewsSrv;
+ nntp_server_t *news = CurrentNewsSrv;
if (i == OP_SUBSCRIBE_PATTERN || i == OP_UNSUBSCRIBE_PATTERN) {
char tmp[STRING];
init_menu (&state, menu, title, sizeof (title), buffy);
}
mutt_newsrc_update (news);
- nntp_clear_cacheindex (news);
if (i != OP_BROWSER_SUBSCRIBE && i != OP_BROWSER_UNSUBSCRIBE)
regfree (rx);
p_delete(&rx);