#include <lib-mime/mime.h>
-#include <lib-ui/enter.h>
+#include <lib-ui/lib-ui.h>
#include <lib-ui/menu.h>
-#include <lib-ui/curses.h>
#include <lib-mx/mx.h>
#include <lib-sys/unix.h>
#include <imap/imap.h>
-static struct mapping_t PostponeHelp[] = {
- {N_("Exit"), OP_EXIT},
- {N_("Del"), OP_DELETE},
- {N_("Undel"), OP_UNDELETE},
- {N_("Help"), OP_HELP},
- {NULL, OP_NULL}
-};
-
-
-
static short PostCount = 0;
static CONTEXT *PostContext = NULL;
static short UpdateNumPostponed = 0;
}
if (LastModify < st.st_mtime) {
-#ifdef USE_NNTP
- int optnews = option (OPTNEWS);
-#endif
LastModify = st.st_mtime;
if (access (Postponed, R_OK | F_OK) != 0)
return (PostCount = 0);
-#ifdef USE_NNTP
- if (optnews)
- unset_option (OPTNEWS);
-#endif
if (mx_open_mailbox (Postponed, M_NOSORT | M_QUIET, &ctx) == NULL)
PostCount = 0;
else
PostCount = ctx.msgcount;
mx_fastclose_mailbox (&ctx);
-#ifdef USE_NNTP
- if (optnews)
- set_option (OPTNEWS);
-#endif
}
return (PostCount);
static void post_entry (char *s, ssize_t slen, MUTTMENU * menu, int entry)
{
- CONTEXT *ctx = (CONTEXT *) menu->data;
-
- _mutt_make_string (s, slen, NONULL (HdrFmt), ctx, ctx->hdrs[entry],
- option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
+ CONTEXT *ctx = (CONTEXT *)menu->data;
+ _mutt_make_string(s, slen, NONULL (HdrFmt), ctx, ctx->hdrs[entry], 0);
}
static HEADER *select_msg (void)
{
MUTTMENU *menu;
int i, done = 0, r = -1;
- char helpstr[STRING];
short orig_sort;
menu = mutt_new_menu ();
menu->max = PostContext->msgcount;
menu->title = _("Postponed Messages");
menu->data = PostContext;
- menu->help =
- mutt_compile_help (helpstr, sizeof (helpstr), MENU_POST, PostponeHelp);
/* The postponed mailbox is setup to have sorting disabled, but the global
* Sort variable may indicate something different. Sorting has to be
string_list_wipe(&tmp);
tmp = next;
}
- else if ((m_strncmp("Pgp:", tmp->data, 4) == 0 /* this is generated
- * by old mutt versions
- */
- || m_strncmp("X-Mutt-PGP:", tmp->data, 11) == 0)) {
+ else if (m_strncmp("X-Mutt-PGP:", tmp->data, 11) == 0) {
hdr->security = mutt_parse_crypt_hdr (strchr (tmp->data, ':') + 1, 1);
hdr->security |= APPLICATION_PGP;
string_list_wipe(&tmp);
tmp = next;
}
- else if (m_strncmp("X-Mutt-Mix:", tmp->data, 11) == 0) {
- char *t;
-
- string_list_wipe(&hdr->chain);
-
- t = strtok (tmp->data + 11, " \t\n");
- while (t) {
- hdr->chain = mutt_add_list (hdr->chain, t);
- t = strtok (NULL, " \t\n");
- }
-
- next = tmp->next;
- if (last)
- last->next = tmp->next;
- else
- hdr->env->userhdrs = tmp->next;
- tmp->next = NULL;
- string_list_wipe(&tmp);
- tmp = next;
- }
else {
last = tmp;
tmp = tmp->next;
return (code);
}
-
-
int mutt_parse_crypt_hdr (char *p, int set_signas)
{
int pgp = 0;
parameter_delval(&b->parameter, "x-mutt-noconv");
}
- s.fpout = m_tempfile(file, sizeof(file), NONULL(MCore.tmpdir), file);
+ s.fpout = m_tempfile(file, sizeof(file), NONULL(mod_core.tmpdir), file);
if (!s.fpout)
goto bail;