X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=postpone.c;h=44cbdb2dfb03a90d6c8afbc47681ace84b149f11;hp=e5a3629d285f02ca46305551fe33cc360a4b9a60;hb=16be8d10413bbcf822577afd4019d65aba7459e0;hpb=dd5354f76c36f71044f6ddeee61241691c7195ff diff --git a/postpone.c b/postpone.c index e5a3629..44cbdb2 100644 --- a/postpone.c +++ b/postpone.c @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include @@ -90,26 +90,15 @@ int mutt_num_postponed (int force) } 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); @@ -325,26 +314,6 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc, 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; @@ -353,8 +322,6 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc, return (code); } - - int mutt_parse_crypt_hdr (char *p, int set_signas) { int pgp = 0;