mirror of
https://github.com/irssi/irssi.git
synced 2025-02-02 15:08:01 -05:00
Remove the target != NULL constraint in recode_out.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4404 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
721650c300
commit
646e3ecb5d
@ -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);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user