diff options
| author | Emanuele Giaquinta <exg@irssi.org> | 2008-04-05 17:07:37 +0000 |
|---|---|---|
| committer | exg <exg@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2008-04-05 17:07:37 +0000 |
| commit | e2362f7884011272fe16c5aea446528dbb026772 (patch) | |
| tree | a6f4421a0ff9c7484736fee84aa7e9711a3fd979 | |
| parent | c28003060803f2fcd3a3b95bfd5d9a8fe4b9fbcb (diff) | |
| download | irssi-e2362f7884011272fe16c5aea446528dbb026772.zip | |
Partly revert r4796, it is not a bug but by design that
recode_fallback is honored only when the terminal encoding is utf-8.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4799 dbcabf3a-b0e7-0310-adc4-f8d773084564
| -rw-r--r-- | src/core/recode.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/recode.c b/src/core/recode.c index 28a32bd5..5a7c9aef 100644 --- a/src/core/recode.c +++ b/src/core/recode.c @@ -125,7 +125,6 @@ char *recode_in(const SERVER_REC *server, const char *str, const char *target) return g_strdup(str); else from = "UTF-8"; - else from = find_conversion(server, target); @@ -139,7 +138,10 @@ char *recode_in(const SERVER_REC *server, const char *str, const char *target) else from = "UTF-8"; else - from = settings_get_str("recode_fallback"); + if (term_is_utf8) + from = settings_get_str("recode_fallback"); + else + from = NULL; if (from) recoded = g_convert_with_fallback(str, len, to, from, NULL, NULL, NULL, NULL); |