X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=postpone.c;h=cb512718e70ec1164edf567a0791a4d0586ed2f4;hp=b5193ec86b77896f140e4dc90d07448a2b25df15;hb=69f4685e616347559d4ec714fd826d7f97a472ef;hpb=ac813896ca32d850febc2d95065ac4fa040f11f9

diff --git a/postpone.c b/postpone.c
index b5193ec..cb51271 100644
--- a/postpone.c
+++ b/postpone.c
@@ -23,7 +23,6 @@
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
 #include <lib-lib/mapping.h>
-#include <lib-lib/debug.h>
 
 #include <lib-mime/mime.h>
 
@@ -32,7 +31,6 @@
 
 #include "mutt.h"
 #include "handler.h"
-#include "rfc1524.h"
 #include "sort.h"
 #include "thread.h"
 #include "mx.h"
@@ -89,10 +87,7 @@ int mutt_num_postponed (int force)
       newpc = imap_mailbox_check (Postponed, 0);
       if (newpc >= 0) {
         PostCount = newpc;
-        debug_print (2, ("%d postponed IMAP messages found.\n", PostCount));
       }
-      else
-        debug_print (2, ("using old IMAP postponed count.\n"));
     }
     return PostCount;
   }
@@ -561,9 +556,8 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
 
   if (mutt_is_multipart_signed (newhdr->content)) {
     newhdr->security |= SIGN;
-    if (ascii_strcasecmp (mutt_get_parameter
-                          ("protocol", newhdr->content->parameter),
-                          "application/pgp-signature") == 0)
+    if (ascii_strcasecmp(parameter_getval(newhdr->content->parameter, "protocol"),
+                         "application/pgp-signature") == 0)
       newhdr->security |= APPLICATION_PGP;
     else
       newhdr->security |= APPLICATION_SMIME;
@@ -612,14 +606,14 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
 
     if (b->type == TYPETEXT) {
       if (!ascii_strcasecmp
-          ("yes", mutt_get_parameter ("x-mutt-noconv", b->parameter)))
+          ("yes", parameter_getval(b->parameter, "x-mutt-noconv")))
         b->noconv = 1;
       else {
         s.flags |= M_CHARCONV;
         b->noconv = 0;
       }
 
-      mutt_delete_parameter ("x-mutt-noconv", &b->parameter);
+      parameter_delval(&b->parameter, "x-mutt-noconv");
     }
 
     mutt_adv_mktemp (NULL, file, sizeof (file));
@@ -635,7 +629,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
 
       b->type = TYPETEXT;
       m_strreplace(&b->subtype, "plain");
-      mutt_delete_parameter ("x-action", &b->parameter);
+      parameter_delval(&b->parameter, "x-action");
     }
     else
       mutt_decode_attachment (b, &s);