diff options
| author | Emanuele Giaquinta <exg@irssi.org> | 2008-04-05 13:11:22 +0000 |
|---|---|---|
| committer | exg <exg@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2008-04-05 13:11:22 +0000 |
| commit | 68763eb4e8f74c8c363ed97525d3b42f8b29e504 (patch) | |
| tree | cca28445329b347b09931f7de6dd7afd8561ba1c /src/core/recode.c | |
| parent | 76fb9b6ac2e2dd1aca91a8814d040f37280a1935 (diff) | |
| download | irssi-68763eb4e8f74c8c363ed97525d3b42f8b29e504.zip | |
Cosmetics.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4797 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/core/recode.c')
| -rw-r--r-- | src/core/recode.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/core/recode.c b/src/core/recode.c index 70768645..28a32bd5 100644 --- a/src/core/recode.c +++ b/src/core/recode.c @@ -117,18 +117,17 @@ char *recode_in(const SERVER_REC *server, const char *str, const char *target) autodetect = settings_get_bool("recode_autodetect_utf8"); 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 (term_is_utf8) return g_strdup(str); else from = "UTF-8"; - else { + else from = find_conversion(server, target); - } - - if (translit && !is_translit(to)) - to = translit_to = g_strconcat(to, "//TRANSLIT", NULL); if (from) recoded = g_convert_with_fallback(str, len, to, from, NULL, NULL, NULL, NULL); |