diff options
author | Emanuele Giaquinta <exg@irssi.org> | 2007-05-05 15:37:58 +0000 |
---|---|---|
committer | exg <exg@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2007-05-05 15:37:58 +0000 |
commit | bfc0b362e8f831dd47fec43a0ad18e4b2cfbba34 (patch) | |
tree | 969d5c50235b1247b7430ba5118dfb38a332df87 /src/fe-common/irc/fe-irc-messages.c | |
parent | 2a915b21dede9b2ddac8822da7c9697ea8c71bbd (diff) | |
download | irssi-bfc0b362e8f831dd47fec43a0ad18e4b2cfbba34.zip |
Move input recoding in irc_server_event.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4483 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/fe-common/irc/fe-irc-messages.c')
-rw-r--r-- | src/fe-common/irc/fe-irc-messages.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c index 5c3a95b3..5c924d27 100644 --- a/src/fe-common/irc/fe-irc-messages.c +++ b/src/fe-common/irc/fe-irc-messages.c @@ -150,7 +150,7 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg, const char *target) { void *item; - char *freemsg = NULL, *recoded; + char *freemsg = NULL; int level; level = MSGLEVEL_ACTIONS | @@ -167,28 +167,26 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg, if (settings_get_bool("emphasis")) msg = freemsg = expand_emphasis(item, msg); - recoded = recode_in(SERVER(server), msg, target); if (ischannel(*target)) { /* channel action */ if (window_item_is_active(item)) { /* message to active channel in window */ printformat(server, target, level, - IRCTXT_ACTION_PUBLIC, nick, recoded); + IRCTXT_ACTION_PUBLIC, nick, msg); } else { /* message to not existing/active channel */ printformat(server, target, level, IRCTXT_ACTION_PUBLIC_CHANNEL, - nick, target, recoded); + nick, target, msg); } } else { /* private action */ printformat(server, nick, MSGLEVEL_ACTIONS | MSGLEVEL_MSGS, item == NULL ? IRCTXT_ACTION_PRIVATE : IRCTXT_ACTION_PRIVATE_QUERY, - nick, address == NULL ? "" : address, recoded); + nick, address == NULL ? "" : address, msg); } - g_free(recoded); g_free_not_null(freemsg); } @@ -208,20 +206,17 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg, const char *target) { const char *oldtarget; - char *recoded; oldtarget = target; target = skip_target(target); if (address == NULL || *address == '\0') { /* notice from server */ - recoded = recode_in(SERVER(server), msg, NULL); if (!ignore_check(server, nick, "", target, msg, MSGLEVEL_SNOTES)) { printformat(server, target, MSGLEVEL_SNOTES, - IRCTXT_NOTICE_SERVER, nick, recoded); + IRCTXT_NOTICE_SERVER, nick, msg); } - g_free(recoded); return; } @@ -230,19 +225,17 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg, msg, MSGLEVEL_NOTICES)) return; - recoded = recode_in(SERVER(server), msg, target); if (ischannel(*target)) { /* notice in some channel */ printformat(server, target, MSGLEVEL_NOTICES, - IRCTXT_NOTICE_PUBLIC, nick, oldtarget, recoded); + IRCTXT_NOTICE_PUBLIC, nick, oldtarget, msg); } else { /* private notice */ privmsg_get_query(SERVER(server), nick, FALSE, MSGLEVEL_NOTICES); printformat(server, nick, MSGLEVEL_NOTICES, - IRCTXT_NOTICE_PRIVATE, nick, address, recoded); + IRCTXT_NOTICE_PRIVATE, nick, address, msg); } - g_free(recoded); } static void sig_message_own_ctcp(IRC_SERVER_REC *server, const char *cmd, |