imap/UTF7 related fixes from EGE.

diff --git a/imap/imap_private.h b/imap/imap_private.h
index 0999deb941733c4dff87d9950dcc2cdb776a7f6a..92284f20d8e44ec51c6ffd0291fe34702f73fa74 100644 (file)
--- a/imap/imap_private.h
+++ b/imap/imap_private.h
@@ -211,8 +211,8 @@ void imap_munge_mbox_name (char *dest, size_t dlen, const char *src);
 void imap_unmunge_mbox_name (char *s);
 int imap_wordcasecmp(const char *a, const char *b);
 
-/* utf8.c */
-void mutt_utf7_encode (char **s);
-void mutt_utf7_decode (char **s);
+/* utf7.c */
+void imap_utf7_encode (char **s);
+void imap_utf7_decode (char **s);
 
 #endif

diff --git a/imap/util.c b/imap/util.c
index 3a6d1540e39423dfbac5a39215c2f94e01f7a319..e118c87d00cac4afed0bd1872ed793185b2d8af4 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -318,7 +318,7 @@ void imap_munge_mbox_name (char *dest, size_t dlen, const char *src)
   char *buf;
 
   buf = safe_strdup (src);
-  mutt_utf7_encode (&buf);
+  imap_utf7_encode (&buf);
 
   imap_quote_string (dest, dlen, buf);
 
@@ -334,7 +334,7 @@ void imap_unmunge_mbox_name (char *s)
   buf = safe_strdup (s);
   if (buf)
   {
-    mutt_utf7_decode (&buf);
+    imap_utf7_decode (&buf);
     strncpy (s, buf, strlen (s));
   }