forked from PsychoticNinja/irssi
Cosmetics.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4797 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
76fb9b6ac2
commit
68763eb4e8
@ -117,18 +117,17 @@ char *recode_in(const SERVER_REC *server, const char *str, const char *target)
|
|||||||
autodetect = settings_get_bool("recode_autodetect_utf8");
|
autodetect = settings_get_bool("recode_autodetect_utf8");
|
||||||
term_is_utf8 = recode_get_charset(&to);
|
term_is_utf8 = recode_get_charset(&to);
|
||||||
|
|
||||||
|
if (translit && !is_translit(to))
|
||||||
|
to = translit_to = g_strconcat(to, "//TRANSLIT", NULL);
|
||||||
|
|
||||||
if (autodetect && str_is_utf8)
|
if (autodetect && str_is_utf8)
|
||||||
if (term_is_utf8)
|
if (term_is_utf8)
|
||||||
return g_strdup(str);
|
return g_strdup(str);
|
||||||
else
|
else
|
||||||
from = "UTF-8";
|
from = "UTF-8";
|
||||||
|
|
||||||
else {
|
else
|
||||||
from = find_conversion(server, target);
|
from = find_conversion(server, target);
|
||||||
}
|
|
||||||
|
|
||||||
if (translit && !is_translit(to))
|
|
||||||
to = translit_to = g_strconcat(to, "//TRANSLIT", NULL);
|
|
||||||
|
|
||||||
if (from)
|
if (from)
|
||||||
recoded = g_convert_with_fallback(str, len, to, from, NULL, NULL, NULL, NULL);
|
recoded = g_convert_with_fallback(str, len, to, from, NULL, NULL, NULL, NULL);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user