X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=postpone.c;h=74490e472a0897090471dcaa910fc100207473f1;hp=62939a8199b815210f5fd90decf6c9cb4776a72c;hb=3ebcd58b39ed808d967c502b332efc868e468a3c;hpb=1d0ce70b85c36973b50e5783fe7b72941c81c0a9

diff --git a/postpone.c b/postpone.c
index 62939a8..74490e4 100644
--- a/postpone.c
+++ b/postpone.c
@@ -23,7 +23,7 @@
 #include "handler.h"
 #include "sort.h"
 #include "thread.h"
-#include <lib-crypt/crypt.h>
+#include "crypt.h"
 
 #include <imap/imap.h>
 
@@ -135,14 +135,14 @@ 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],
-                     M_FORMAT_ARROWCURSOR);
+                     option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
 }
 
 static HEADER *select_msg (void)
 {
   MUTTMENU *menu;
   int i, done = 0, r = -1;
-  char helpstr[SHORT_STRING];
+  char helpstr[STRING];
   short orig_sort;
 
   menu = mutt_new_menu ();
@@ -312,10 +312,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;
 
@@ -508,17 +505,14 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
   {
     int ccap = (APPLICATION_PGP | APPLICATION_SMIME) & hdr->security;
     newhdr->security |= ENCRYPT | ccap;
-    if (!crypt_valid_passphrase (ccap))
-      goto err;
-
     mutt_message _("Decrypting message...");
 
     if (((ccap & APPLICATION_PGP)
          && 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);
@@ -589,18 +583,15 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
     s.flags = 0;
 
     if (b->type == TYPETEXT) {
-      if (!ascii_strcasecmp
-          ("yes", parameter_getval(b->parameter, "x-mutt-noconv")))
-        b->noconv = 1;
-      else {
+      b->noconv = !ascii_strcasecmp("yes", parameter_getval(b->parameter,
+                                                            "x-mutt-noconv"));
+      if (b->noconv)
         s.flags |= M_CHARCONV;
-        b->noconv = 0;
-      }
 
       parameter_delval(&b->parameter, "x-mutt-noconv");
     }
 
-    s.fpout = m_tempfile(file, sizeof(file), NONULL(Tempdir), file);
+    s.fpout = m_tempfile(file, sizeof(file), NONULL(MCore.tmpdir), file);
     if (!s.fpout)
       goto bail;
 
@@ -639,7 +630,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;