Rocco Rutte:

[apps/madmutt.git] / rfc2047.c

diff --git a/rfc2047.c b/rfc2047.c
index c670858..c8c1bea 100644 (file)
--- a/rfc2047.c
+++ b/rfc2047.c
@@ -17,6 +17,9 @@
 #include "charset.h"
 #include "rfc2047.h"
 
+#include "lib/mem.h"
+#include "lib/str.h"
+
 #include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
@@ -133,7 +136,7 @@ char *mutt_choose_charset (const char *fromcode, const char *charsets,
       *dlen = elen;
 
     mutt_canonical_charset (canonical_buff, sizeof (canonical_buff), tocode);
-    mutt_str_replace (&tocode, canonical_buff);
+    str_replace (&tocode, canonical_buff);
   }
   return tocode;
 }
@@ -540,10 +543,6 @@ void rfc2047_encode_adrlist (ADDRESS * addr, const char *tag)
   while (ptr) {
     if (ptr->personal)
       _rfc2047_encode_string (&ptr->personal, 1, col);
-#ifdef EXACT_ADDRESS
-    if (ptr->val)
-      _rfc2047_encode_string (&ptr->val, 1, col);
-#endif
     ptr = ptr->next;
   }
 }
@@ -790,7 +789,7 @@ void rfc2047_decode (char **pd)
 
   FREE (pd);
   *pd = d0;
-  mutt_str_adjust (pd);
+  str_adjust (pd);
 }
 
 void rfc2047_decode_adrlist (ADDRESS * a)
@@ -798,10 +797,6 @@ void rfc2047_decode_adrlist (ADDRESS * a)
   while (a) {
     if (a->personal)
       rfc2047_decode (&a->personal);
-#ifdef EXACT_ADDRESS
-    if (a->val && strstr (a->val, "=?") != NULL)
-      rfc2047_decode (&a->val);
-#endif
     a = a->next;
   }
 }