X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_idna.c;h=686e849b0181d60f7abe9aaaab152a885393ab5d;hp=1a9bd8b279e1b65239db00b4a080d1808a5eef44;hb=c128336d307ca44d2721c0135bcdef577ff3089e;hpb=f3cbb9f51357972f6e74244494236a41dc4d84cd diff --git a/mutt_idna.c b/mutt_idna.c index 1a9bd8b..686e849 100644 --- a/mutt_idna.c +++ b/mutt_idna.c @@ -48,7 +48,7 @@ int mutt_idna_to_local (const char *in, char **out, int flags) /* Is this the right function? Interesting effects with some bad identifiers! */ if (idna_to_unicode_8z8z (in, out, 1) != IDNA_SUCCESS) goto notrans; - if (mutt_convert_string (out, "utf-8", Charset, M_ICONV_HOOK_TO) == -1) + if (mutt_convert_string (out, "utf-8", MCharset.charset, M_ICONV_HOOK_TO) == -1) goto notrans; /* @@ -61,7 +61,7 @@ int mutt_idna_to_local (const char *in, char **out, int flags) char *t2 = NULL; char *tmp = m_strdup(*out); - if (mutt_convert_string (&tmp, Charset, "utf-8", M_ICONV_HOOK_FROM) == -1) + if (mutt_convert_string (&tmp, MCharset.charset, "utf-8", M_ICONV_HOOK_FROM) == -1) irrev = 1; if (!irrev && idna_to_ascii_8z (tmp, &t2, 1) != IDNA_SUCCESS) irrev = 1; @@ -96,7 +96,7 @@ int mutt_local_to_idna (const char *in, char **out) return -1; } - if (mutt_convert_string (&tmp, Charset, "utf-8", M_ICONV_HOOK_FROM) == -1) + if (mutt_convert_string (&tmp, MCharset.charset, "utf-8", M_ICONV_HOOK_FROM) == -1) rv = -1; if (!rv && idna_to_ascii_8z (tmp, out, 1) != IDNA_SUCCESS) rv = -2;