zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-11 04:43:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Added an option to specify a charset for a whole network. For example /recode add IRCnet iso-8859-1 (http://bugs.irssi.org/index.php?do=details&id=284) Patch by Sergey Safonov. Replaced g_convert by g_convert_with_fallback in recode_in (http://bugs.irssi.org/index.php?do=details&id=241) Patch by Kuang-che Wu.

Browse source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@3881 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Valentin Batz 2005-07-24 19:16:14 +00:00 • committed by vb
commit 56041a3144
2 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/core/recode.c
View file

@ -87,23 +87,27 @@ char *recode_in(const SERVER_REC *server, const char *str, const char *target)
str_is_utf8 = g_utf8_validate(str, len, NULL);
translit = settings_get_bool("recode_transliterate");
if (server != NULL)
tagtarget = server->tag == NULL ? NULL :
g_strdup_printf("%s/%s", server->tag, target);
if (tagtarget != NULL)
from = iconfig_get_str("conversions", tagtarget, NULL);
g_free(tagtarget);
if (target != NULL && from == NULL)
from = iconfig_get_str("conversions", target, NULL);
if (from == NULL)
from = iconfig_get_str("conversions", server->tag, NULL);
term_is_utf8 = recode_get_charset(&to);
if (translit && !is_translit(to))
to = translit_to = g_strconcat(to, "//TRANSLIT", NULL);
if (from)
recoded = g_convert(str, len, to, from, NULL, NULL, NULL);
recoded = g_convert_with_fallback(str, len, to, from, NULL, NULL, NULL);
if (!recoded) {
if (term_is_utf8) {
@ -114,7 +118,7 @@ char *recode_in(const SERVER_REC *server, const char *str, const char *target)
from = "UTF-8";
if (from)
recoded = g_convert(str, len, to, from, NULL, NULL, NULL);
recoded = g_convert_with_fallback(str, len, to, from, NULL, NULL, NULL);
if (!recoded)
recoded = g_strdup(str);
@ -158,6 +162,8 @@ char *recode_out(const SERVER_REC *server, const char *str, const char *target)
g_free(tagtarget);
if (to == NULL || *to == '\0')
to = iconfig_get_str("conversions", target, NULL);
if (to == NULL || *to == '\0')
to = iconfig_get_str("conversions", server->tag, NULL);
if (to == NULL || *to == '\0')
/* default outgoing charset if set */
to = settings_get_str("recode_out_default_charset");