mirror of
https://github.com/irssi/irssi.git
synced 2025-01-03 14:56:47 -05:00
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
This commit is contained in:
parent
c280030608
commit
e2362f7884
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user