X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Futf7.c;h=ca40c8da85034475a54c746afc8fea9b8fb38c60;hp=e9ae15d904e2e31d2d47bf4cacef32cfd6247810;hb=819c071fa7efc8dffb4dd92f36f0111227ff692f;hpb=ac813896ca32d850febc2d95065ac4fa040f11f9

diff --git a/imap/utf7.c b/imap/utf7.c
index e9ae15d..ca40c8d 100644
--- a/imap/utf7.c
+++ b/imap/utf7.c
@@ -7,11 +7,7 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <lib-lib/mem.h>
+#include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
 #include "charset.h"
@@ -212,10 +208,10 @@ bail:
 
 void imap_utf7_encode (char **s)
 {
-  if (Charset) {
+  if (mod_cset.charset) {
     char *t = m_strdup(*s);
 
-    if (!mutt_convert_string (&t, Charset, "UTF-8", 0)) {
+    if (!mutt_convert_string (&t, mod_cset.charset, "utf-8", 0)) {
       char *u7 = utf8_to_utf7 (t, strlen (t), NULL, 0);
       p_delete(s);
       *s = u7;
@@ -226,10 +222,10 @@ void imap_utf7_encode (char **s)
 
 void imap_utf7_decode (char **s)
 {
-  if (Charset) {
+  if (mod_cset.charset) {
     char *t = utf7_to_utf8 (*s, m_strlen(*s), 0, 0);
 
-    if (t && !mutt_convert_string (&t, "UTF-8", Charset, 0)) {
+    if (t && !mutt_convert_string (&t, "utf-8", mod_cset.charset, 0)) {
       p_delete(s);
       *s = t;
     }