Import madtty, use it to deal with colors from now on as it needs to know what is...

[apps/madmutt.git] / postpone.c

diff --git a/postpone.c b/postpone.c
index e5a3629..44cbdb2 100644 (file)
--- 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>
@@ -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;