From 646e3ecb5dbeeebdc4c8f9efffc5a58d33599f72 Mon Sep 17 00:00:00 2001 From: Emanuele Giaquinta Date: Sat, 6 Jan 2007 16:00:45 +0000 Subject: [PATCH] Remove the target != NULL constraint in recode_out. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4404 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- src/core/recode.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/core/recode.c b/src/core/recode.c index 1cbf3a69..fd7f06c5 100644 --- a/src/core/recode.c +++ b/src/core/recode.c @@ -167,6 +167,8 @@ char *recode_out(const SERVER_REC *server, const char *str, const char *target) #ifdef HAVE_GLIB2 char *recoded = NULL; const char *from = NULL; + const char *to = NULL; + char *translit_to = NULL; gboolean translit, term_is_utf8, recode; int len; @@ -181,10 +183,6 @@ char *recode_out(const SERVER_REC *server, const char *str, const char *target) translit = settings_get_bool("recode_transliterate"); - if (target) { - const char *to = NULL; - char *translit_to = NULL; - 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); @@ -206,7 +204,6 @@ char *recode_out(const SERVER_REC *server, const char *str, const char *target) recoded = g_convert(str, len, to, from, NULL, NULL, NULL); } g_free(translit_to); - } if (!recoded) recoded = g_strdup(str);