X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=postpone.c;h=7cfe924bc1fc328ef32e3633ca9e755b5a380539;hp=73a1057db1236db8d33dc9815d3803e34aef297c;hb=69cbbd6ba2aec89f81ecf169e21b7bc4ec5bce90;hpb=91d0c04349c9345f0ee29a61cc18dfc144b60edc

diff --git a/postpone.c b/postpone.c
index 73a1057..7cfe924 100644
--- a/postpone.c
+++ b/postpone.c
@@ -19,12 +19,13 @@
 #include <lib-lib/file.h>
 #include <lib-lib/mapping.h>
 
+#include <lib-mime/mime.h>
+
 #include "mutt.h"
 #include "enter.h"
 #include "handler.h"
 #include "mutt_menu.h"
 #include "rfc1524.h"
-#include "mime.h"
 #include "sort.h"
 #include "thread.h"
 #include "mx.h"
@@ -488,10 +489,10 @@ int mutt_parse_crypt_hdr (char *p, int set_signas)
 
   /* the cryptalg field must not be empty */
   if ((WithCrypto & APPLICATION_SMIME) && *smime_cryptalg)
-    str_replace (&SmimeCryptAlg, smime_cryptalg);
+    m_strreplace(&SmimeCryptAlg, smime_cryptalg);
 
   if ((WithCrypto & APPLICATION_PGP) && (set_signas || *pgp_sign_as))
-    str_replace (&PgpSignAs, pgp_sign_as);
+    m_strreplace(&PgpSignAs, pgp_sign_as);
 
   return pgp;
 }
@@ -645,7 +646,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
       newhdr->security |= mutt_is_application_pgp (newhdr->content);
 
       b->type = TYPETEXT;
-      str_replace (&b->subtype, "plain");
+      m_strreplace(&b->subtype, "plain");
       mutt_delete_parameter ("x-action", &b->parameter);
     }
     else
@@ -654,7 +655,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
     if (safe_fclose (&s.fpout) != 0)
       goto bail;
 
-    str_replace (&b->filename, file);
+    m_strreplace(&b->filename, file);
     b->unlink = 1;
 
     mutt_stamp_attachment (b);