add -lpthread in the MUTTLIBS

[apps/madmutt.git] / postpone.c

diff --git a/postpone.c b/postpone.c
index 485b44f..023b32f 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -12,9 +12,8 @@
 
 #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>
@@ -27,16 +26,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;
@@ -68,7 +57,7 @@ int mutt_num_postponed (int force)
     return 0;
 
   /* LastModify is useless for IMAP */
-  if (imap_is_magic (Postponed, NULL) == M_IMAP) {
+  if (imap_mx.mx_is_magic (Postponed, NULL) == M_IMAP) {
     if (force) {
       short newpc;
 
@@ -83,7 +72,7 @@ int mutt_num_postponed (int force)
   if (stat (Postponed, &st) == -1) {
     PostCount = 0;
     LastModify = 0;
-    return (0);
+    return 0;
   }
 
   if (S_ISDIR (st.st_mode)) {
@@ -100,29 +89,18 @@ 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
+      return PostCount = 0;
     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);
+  return PostCount;
 }
 
 void mutt_update_num_postponed (void)
@@ -132,17 +110,14 @@ void mutt_update_num_postponed (void)
 
 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 ();
@@ -151,8 +126,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
@@ -194,7 +167,7 @@ static HEADER *select_msg (void)
 
   Sort = orig_sort;
   mutt_menuDestroy (&menu);
-  return (r > -1 ? PostContext->hdrs[r] : NULL);
+  return r > -1 ? PostContext->hdrs[r] : NULL;
 }
 
 /* args:
@@ -223,13 +196,13 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
   int opt_delete;
 
   if (!Postponed)
-    return (-1);
+    return -1;
 
   if ((PostContext = mx_open_mailbox (Postponed, M_NOSORT, NULL)) == NULL) {
     PostCount = 0;
     mutt_error _("No postponed messages.");
 
-    return (-1);
+    return -1;
   }
 
   if (!PostContext->msgcount) {
@@ -238,7 +211,7 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
     p_delete(&PostContext);
     mutt_error _("No postponed messages.");
 
-    return (-1);
+    return -1;
   }
 
   if (PostContext->msgcount == 1) {
@@ -248,13 +221,13 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
   else if ((h = select_msg ()) == NULL) {
     mx_close_mailbox (PostContext, NULL);
     p_delete(&PostContext);
-    return (-1);
+    return -1;
   }
 
   if (mutt_prepare_template (NULL, PostContext, hdr, h, 0) < 0) {
     mx_fastclose_mailbox (PostContext);
     p_delete(&PostContext);
-    return (-1);
+    return -1;
   }
 
   /* finished with this message, so delete it. */
@@ -312,10 +285,7 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
       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;
 
@@ -343,36 +313,14 @@ 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;
     }
   }
-  return (code);
+  return code;
 }
 
-
-
 int mutt_parse_crypt_hdr (char *p, int set_signas)
 {
   int pgp = 0;
@@ -483,7 +431,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
   p_clear(&s, 1);
 
   if (!fp && (msg = mx_open_message (ctx, hdr->msgno)) == NULL)
-    return (-1);
+    return -1;
 
   if (!fp)
     fp = msg->fp;
@@ -514,8 +462,8 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
          && crypt_pgp_decrypt_mime (fp, &bfp, newhdr->content, &b) == -1)
         || ((ccap & APPLICATION_SMIME)
             && crypt_smime_decrypt_mime (fp, &bfp, newhdr->content, &b) == -1)
-        || b == NULL) {
-    err:
+        || b == NULL)
+    {
       mx_close_message (&msg);
       envelope_delete(&newhdr->env);
       body_list_wipe(&newhdr->content);
@@ -594,7 +542,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
       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;
 
@@ -633,7 +581,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
   /* Theoretically, both could be set. Take the one the user wants to set by default. */
   if ((newhdr->security & APPLICATION_PGP)
       && (newhdr->security & APPLICATION_SMIME)) {
-    if (option (OPTSMIMEISDEFAULT))
+    if (mod_crypt.smime_is_default)
       newhdr->security &= ~APPLICATION_PGP;
     else
       newhdr->security &= ~APPLICATION_SMIME;