diff options
author | Emanuele Giaquinta <exg@irssi.org> | 2007-01-06 16:08:29 +0000 |
---|---|---|
committer | exg <exg@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2007-01-06 16:08:29 +0000 |
commit | ef0cc3fecab4854cc6969abef89d82cff4f714ba (patch) | |
tree | 5b68b402c56f949c2fd2c595e244d5108deb42ea | |
parent | 646e3ecb5dbeeebdc4c8f9efffc5a58d33599f72 (diff) | |
download | irssi-ef0cc3fecab4854cc6969abef89d82cff4f714ba.zip |
Reindent.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4405 dbcabf3a-b0e7-0310-adc4-f8d773084564
-rw-r--r-- | src/core/recode.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/core/recode.c b/src/core/recode.c index fd7f06c5..aadc09b2 100644 --- a/src/core/recode.c +++ b/src/core/recode.c @@ -183,27 +183,27 @@ char *recode_out(const SERVER_REC *server, const char *str, const char *target) translit = settings_get_bool("recode_transliterate"); - if (server != NULL && server->tag != NULL && target != NULL) { - char *tagtarget = g_strdup_printf("%s/%s", server->tag, target); - to = iconfig_get_str("conversions", tagtarget, NULL); - g_free(tagtarget); - } - if (to == NULL || *to == '\0') - to = iconfig_get_str("conversions", target, NULL); - if ((to == NULL || *to == '\0') && server != NULL) - 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"); - - if (to && *to != '\0') { - if (translit && !is_translit(to)) - to = translit_to = g_strconcat(to ,"//TRANSLIT", NULL); - - term_is_utf8 = recode_get_charset(&from); - recoded = g_convert(str, len, to, from, NULL, NULL, NULL); - } - g_free(translit_to); + if (server != NULL && server->tag != NULL && target != NULL) { + char *tagtarget = g_strdup_printf("%s/%s", server->tag, target); + to = iconfig_get_str("conversions", tagtarget, NULL); + g_free(tagtarget); + } + if (to == NULL || *to == '\0') + to = iconfig_get_str("conversions", target, NULL); + if ((to == NULL || *to == '\0') && server != NULL) + 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"); + + if (to && *to != '\0') { + if (translit && !is_translit(to)) + to = translit_to = g_strconcat(to ,"//TRANSLIT", NULL); + + term_is_utf8 = recode_get_charset(&from); + recoded = g_convert(str, len, to, from, NULL, NULL, NULL); + } + g_free(translit_to); if (!recoded) recoded = g_strdup(str); |