X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=parse.c;h=9d1fcbab597d488eb9a2a1c7dbb5816e20853edc;hp=fd8e92b883b1156aa8a76019d328593e4c20ffef;hb=df5b14084b39821395408679a2fb6f74605182ce;hpb=cfc49a0d8c3ac2c0bd4b217026d0740c55f2e5db

diff --git a/parse.c b/parse.c
index fd8e92b..9d1fcba 100644
--- a/parse.c
+++ b/parse.c
@@ -23,7 +23,6 @@
 #include "enter.h"
 #include "recvattach.h"
 #include "mx.h"
-#include "rfc2047.h"
 #include "mutt_crypt.h"
 #include "url.h"
 
@@ -396,7 +395,7 @@ static void parse_content_disposition (char *s, BODY * ct)
     s = vskipspaces(s + 1);
     if ((s = mutt_get_parameter("filename",
                                 (parms = parse_parameters (s)))) != 0)
-      str_replace (&ct->filename, s);
+      m_strreplace(&ct->filename, s);
     if ((s = mutt_get_parameter ("name", parms)) != 0)
       ct->form_name = m_strdup(s);
     mutt_free_parameter (&parms);
@@ -446,7 +445,7 @@ BODY *mutt_read_mime_header (FILE * fp, int digest)
       else if (!ascii_strcasecmp ("disposition", line + 8))
         parse_content_disposition (c, p);
       else if (!ascii_strcasecmp ("description", line + 8)) {
-        str_replace (&p->description, c);
+        m_strreplace(&p->description, c);
         rfc2047_decode (&p->description);
       }
     }
@@ -459,7 +458,7 @@ BODY *mutt_read_mime_header (FILE * fp, int digest)
       else if (!ascii_strcasecmp ("content-lines", line + 6))
         mutt_set_parameter ("content-lines", c, &(p->parameter));
       else if (!ascii_strcasecmp ("data-description", line + 6)) {
-        str_replace (&p->description, c);
+        m_strreplace(&p->description, c);
         rfc2047_decode (&p->description);
       }
     }
@@ -515,7 +514,7 @@ void mutt_parse_part (FILE * fp, BODY * b)
   /* try to recover from parsing error */
   if (!b->parts) {
     b->type = TYPETEXT;
-    str_replace (&b->subtype, "plain");
+    m_strreplace(&b->subtype, "plain");
   }
 }
 
@@ -991,7 +990,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
       }
       else if (ascii_strcasecmp (line + 8, "description") == 0) {
         if (hdr) {
-          str_replace (&hdr->content->description, p);
+          m_strreplace(&hdr->content->description, p);
           rfc2047_decode (&hdr->content->description);
         }
         matched = 1;
@@ -1006,7 +1005,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
 
   case 'd':
     if (!ascii_strcasecmp ("ate", line + 1)) {
-      str_replace (&e->date, p);
+      m_strreplace(&e->date, p);
       if (hdr)
         hdr->date_sent = mutt_parse_date (p, hdr);
       matched = 1;