X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=url.c;h=81b47c7768ef9c9a514cc9691737158efe5c686d;hp=67a94cdbe84fb129193c409ec09c2e1ca857e378;hb=e25b0de8c4e7d6aeeb467f8ea1ad8dd6b2a9470e;hpb=91d0c04349c9345f0ee29a61cc18dfc144b60edc

diff --git a/url.c b/url.c
index 67a94cd..81b47c7 100644
--- a/url.c
+++ b/url.c
@@ -19,10 +19,11 @@
 #include <lib-lib/ascii.h>
 #include <lib-lib/mapping.h>
 
+#include <lib-mime/mime.h>
+
 #include "mutt.h"
 #include "url.h"
 
-#include "mime.h"
 
 #include <ctype.h>
 
@@ -49,10 +50,7 @@ static void url_pct_decode (char *s)
     return;
 
   for (d = s; *s; s++) {
-    if (*s == '%' && s[1] && s[2] &&
-        isxdigit ((unsigned char) s[1]) &&
-        isxdigit ((unsigned char) s[2]) &&
-        hexval (s[1]) >= 0 && hexval (s[2]) >= 0) {
+    if (*s == '%' && hexval (s[1]) >= 0 && hexval (s[2]) >= 0) {
       *d++ = (hexval (s[1]) << 4) | (hexval (s[2]));
       s += 2;
     }
@@ -236,7 +234,7 @@ int url_parse_mailto (ENVELOPE * e, char **body, const char *src)
 
     if (!ascii_strcasecmp (tag, "body")) {
       if (body)
-        str_replace (body, value);
+        m_strreplace(body, value);
     }
     else {
 #define SAFEPFX (option (OPTSTRICTMAILTO) ? "" : "X-Mailto-")