X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=postpone.c;h=44cbdb2dfb03a90d6c8afbc47681ace84b149f11;hp=8a7719ba6409ae3d60728ea19564050e594b75c6;hb=16be8d10413bbcf822577afd4019d65aba7459e0;hpb=c50162101b316e88b95dc4259d45a259b38a972e

diff --git a/postpone.c b/postpone.c
index 8a7719b..44cbdb2 100644
--- a/postpone.c
+++ b/postpone.c
@@ -14,7 +14,7 @@
 
 #include <lib-ui/enter.h>
 #include <lib-ui/menu.h>
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
 #include <lib-mx/mx.h>
 
 #include <lib-sys/unix.h>
@@ -27,16 +27,6 @@
 
 #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;
@@ -100,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);
@@ -140,7 +119,6 @@ static HEADER *select_msg (void)
 {
   MUTTMENU *menu;
   int i, done = 0, r = -1;
-  char helpstr[STRING];
   short orig_sort;
 
   menu = mutt_new_menu ();
@@ -149,8 +127,6 @@ static HEADER *select_msg (void)
   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
@@ -338,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;
@@ -366,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;