nntp fixes: no more warnings.

[apps/madmutt.git] / postpone.c

diff --git a/postpone.c b/postpone.c
index 485b44f..8a7719b 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -132,10 +132,8 @@ 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)
@@ -312,10 +310,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;
 
@@ -514,8 +509,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 +589,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 +628,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;