diff options
| author | Valentin Batz <senneth@irssi.org> | 2005-10-16 11:16:33 +0000 |
|---|---|---|
| committer | vb <vb@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2005-10-16 11:16:33 +0000 |
| commit | 0b8a23ad637c62ab763ef79397e81de91d4b627b (patch) | |
| tree | a878aa3c66fa75976b28e53b00bce885af4e539c | |
| parent | 4a7107437d7d8d6c23a3a7c133c3adac588bec1c (diff) | |
| download | irssi-0b8a23ad637c62ab763ef79397e81de91d4b627b.zip | |
fixed a bug in recode when target is NULL and really use the recoded string for printing
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4042 dbcabf3a-b0e7-0310-adc4-f8d773084564
| -rw-r--r-- | src/core/recode.c | 4 | ||||
| -rw-r--r-- | src/fe-common/irc/fe-irc-messages.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/recode.c b/src/core/recode.c index 65da780d..fbc17944 100644 --- a/src/core/recode.c +++ b/src/core/recode.c @@ -88,7 +88,7 @@ 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) + if (server != NULL && target != NULL) tagtarget = server->tag == NULL ? NULL : g_strdup_printf("%s/%s", server->tag, target); if (tagtarget != NULL) @@ -154,7 +154,7 @@ char *recode_out(const SERVER_REC *server, const char *str, const char *target) char *translit_to = NULL; char *tagtarget = NULL; - if (server != NULL) + if (server != NULL && target != NULL) tagtarget = server->tag == NULL ? NULL : g_strdup_printf("%s/%s", server->tag, target); if (tagtarget != NULL) diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c index 538eb8ec..47922d4e 100644 --- a/src/fe-common/irc/fe-irc-messages.c +++ b/src/fe-common/irc/fe-irc-messages.c @@ -196,7 +196,7 @@ static void sig_message_own_notice(IRC_SERVER_REC *server, const char *msg, char *recoded = recode_in(SERVER(server), msg, target); printformat(server, skip_target(target), MSGLEVEL_NOTICES | MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT, - IRCTXT_OWN_NOTICE, target, msg); + IRCTXT_OWN_NOTICE, target, recoded); g_free(recoded); } @@ -216,7 +216,7 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg, if (!ignore_check(server, nick, "", target, msg, MSGLEVEL_SNOTES)) { printformat(server, target, MSGLEVEL_SNOTES, - IRCTXT_NOTICE_SERVER, nick, msg); + IRCTXT_NOTICE_SERVER, nick, recoded); } g_free(recoded); return; |