Added <tag>/<target> support for recode.

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@3692 dbcabf3a-b0e7-0310-adc4-f8d773084564

4 files changed, 16 insertions, 16 deletions

diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index cb8604b5..459502a0 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -119,7 +119,7 @@ static void event_who(IRC_SERVER_REC *server, const char *data)
 	while (*realname == ' ') realname++;
 	if (realname > hops) realname[-1] = '\0';
 	
-	recoded = recode_in(realname, nick);
+	recoded = recode_in(SERVER(server), realname, nick);
 	printformat(server, NULL, MSGLEVEL_CRAP, IRCTXT_WHO,
 		    channel, nick, stat, hops, user, host, recoded, serv);
 
@@ -236,7 +236,7 @@ static void event_topic_get(IRC_SERVER_REC *server, const char *data)
 	g_return_if_fail(data != NULL);
 
 	params = event_get_params(data, 3, NULL, &channel, &topic);
-	recoded = recode_in(topic, channel);
+	recoded = recode_in(SERVER(server), topic, channel);
 	channel = get_visible_target(server, channel);
 	printformat(server, channel, MSGLEVEL_CRAP,
 		    IRCTXT_TOPIC, channel, recoded);
@@ -316,7 +316,7 @@ static void event_away(IRC_SERVER_REC *server, const char *data)
 	g_return_if_fail(data != NULL);
 
 	params = event_get_params(data, 3, NULL, &nick, &awaymsg);
-	recoded = recode_in(awaymsg, nick);
+	recoded = recode_in(SERVER(server), awaymsg, nick);
 	if (!settings_get_bool("show_away_once") ||
 	    last_away_nick == NULL || g_strcasecmp(last_away_nick, nick) != 0 ||
 	    last_away_msg == NULL || g_strcasecmp(last_away_msg, awaymsg) != 0) {
diff --git a/src/fe-common/irc/fe-events.c b/src/fe-common/irc/fe-events.c
index 6e157caa..2a2433d1 100644
--- a/src/fe-common/irc/fe-events.c
+++ b/src/fe-common/irc/fe-events.c
@@ -52,7 +52,7 @@ static void event_privmsg(IRC_SERVER_REC *server, const char *data,
 	params = event_get_params(data, 2 | PARAM_FLAG_GETREST, &target, &msg);
 	if (nick == NULL) nick = server->real_address;
 	if (addr == NULL) addr = "";
-	recoded = recode_in(msg, target);
+	recoded = recode_in(SERVER(server), msg, target);
 	if (*target == '@' && ischannel(target[1])) {
 		/* Hybrid 6 feature, send msg to all ops in channel */
 		signal_emit("message irc op_public", 5,
@@ -76,7 +76,7 @@ static void ctcp_action(IRC_SERVER_REC *server, const char *data,
 	char *recoded;
 
 	g_return_if_fail(data != NULL);
-	recoded = recode_in(data, target);
+	recoded = recode_in(SERVER(server), data, target);
 	signal_emit("message irc action", 5,
 		    server, recoded, nick, addr,
 		    get_visible_target(server, target));
@@ -91,7 +91,7 @@ static void event_notice(IRC_SERVER_REC *server, const char *data,
 	g_return_if_fail(data != NULL);
 
 	params = event_get_params(data, 2 | PARAM_FLAG_GETREST, &target, &msg);
-	recoded = recode_in(msg, target);
+	recoded = recode_in(SERVER(server), msg, target);
 	if (nick == NULL) {
 		nick = server->real_address == NULL ?
 			server->connrec->address :
@@ -129,7 +129,7 @@ static void event_part(IRC_SERVER_REC *server, const char *data,
 
 	params = event_get_params(data, 2 | PARAM_FLAG_GETREST,
 				  &channel, &reason);
-	recoded = recode_in(reason, channel);
+	recoded = recode_in(SERVER(server), reason, channel);
 	signal_emit("message part", 5, server,
 		    get_visible_target(server, channel), nick, addr, recoded);
 	g_free(params);
@@ -154,7 +154,7 @@ static void event_kick(IRC_SERVER_REC *server, const char *data,
 
 	params = event_get_params(data, 3 | PARAM_FLAG_GETREST,
 				  &channel, &nick, &reason);
-	recoded = recode_in(reason, channel);
+	recoded = recode_in(SERVER(server), reason, channel);
 	signal_emit("message kick", 6,
 		    server, get_visible_target(server, channel),
 		    nick, kicker, addr, recoded);
@@ -261,7 +261,7 @@ static void event_topic(IRC_SERVER_REC *server, const char *data,
 
 	params = event_get_params(data, 2 | PARAM_FLAG_GETREST,
 				  &channel, &topic);
-	recoded = recode_in(topic, channel);
+	recoded = recode_in(SERVER(server), topic, channel);
 	signal_emit("message topic", 5, server,
 		    get_visible_target(server, channel), recoded, nick, addr);
 	g_free(params);
diff --git a/src/fe-common/irc/fe-irc-commands.c b/src/fe-common/irc/fe-irc-commands.c
index 0c948dee..20ee904e 100644
--- a/src/fe-common/irc/fe-irc-commands.c
+++ b/src/fe-common/irc/fe-irc-commands.c
@@ -68,7 +68,7 @@ static void cmd_me(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item)
 		cmd_return_error(CMDERR_NOT_CONNECTED);
 
 	target = window_item_get_target(item);
-	recoded = recode_out(data, target);
+	recoded = recode_out(SERVER(server), data, target);
 
 	signal_emit("message irc own_action", 3, server, recoded,
 		    item->visible_name);
@@ -100,7 +100,7 @@ static void cmd_action(const char *data, IRC_SERVER_REC *server)
 	if (server == NULL || !server->connected)
 		cmd_param_error(CMDERR_NOT_CONNECTED);
 
-	recoded = recode_out(text, target);
+	recoded = recode_out(SERVER(server), text, target);
 	irc_send_cmdv(server, "PRIVMSG %s :\001ACTION %s\001", target, recoded);
 
 	target = skip_target(target);
@@ -128,7 +128,7 @@ static void cmd_notice(const char *data, IRC_SERVER_REC *server,
 	if (*target == '\0' || *msg == '\0')
 		cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
 		
-	recoded = recode_out(msg, target);
+	recoded = recode_out(SERVER(server), msg, target);
 	signal_emit("message irc own_notice", 3, server, recoded, target);
 	
 	g_free(recoded);
diff --git a/src/fe-common/irc/fe-whois.c b/src/fe-common/irc/fe-whois.c
index e9a6de2e..a9a1d499 100644
--- a/src/fe-common/irc/fe-whois.c
+++ b/src/fe-common/irc/fe-whois.c
@@ -20,7 +20,7 @@ static void event_whois(IRC_SERVER_REC *server, const char *data)
 
 	params = event_get_params(data, 6, NULL, &nick, &user,
 				  &host, NULL, &realname);
-	recoded = recode_in(realname, nick);
+	recoded = recode_in(SERVER(server), realname, nick);
 	printformat(server, nick, MSGLEVEL_CRAP,
 		    IRCTXT_WHOIS, nick, user, host, recoded);
 	g_free(params);
@@ -255,7 +255,7 @@ static void event_whois_channels(IRC_SERVER_REC *server, const char *data)
 	chans = show_lowascii(chans);
 	if (settings_get_bool("whois_hide_safe_channel_id"))
 		hide_safe_channel_id(server, chans);
-	recoded = recode_in(chans, nick);
+	recoded = recode_in(SERVER(server), chans, nick);
 	printformat(server, nick, MSGLEVEL_CRAP,
 		    IRCTXT_WHOIS_CHANNELS, nick, recoded);
 	g_free(chans);
@@ -271,7 +271,7 @@ static void event_whois_away(IRC_SERVER_REC *server, const char *data)
 	g_return_if_fail(data != NULL);
 
 	params = event_get_params(data, 3, NULL, &nick, &awaymsg);
-	recoded = recode_in(awaymsg, nick);
+	recoded = recode_in(SERVER(server), awaymsg, nick);
 	printformat(server, nick, MSGLEVEL_CRAP,
 		    IRCTXT_WHOIS_AWAY, nick, recoded);
 	g_free(params);
@@ -312,7 +312,7 @@ static void event_whowas(IRC_SERVER_REC *server, const char *data)
 
 	params = event_get_params(data, 6, NULL, &nick, &user,
 				  &host, NULL, &realname);
-	recoded = recode_in(realname, nick);
+	recoded = recode_in(SERVER(server), realname, nick);
 	printformat(server, nick, MSGLEVEL_CRAP,
 		    IRCTXT_WHOWAS, nick, user, host, recoded);
 	g_free(params);