Revert recode changes r4483 and r4715.

git-svn-id: file:///var/www/svn.irssi.org/SVN/irssi/trunk@4867 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Emanuele Giaquinta 2008-08-02 13:15:38 +00:00 committed by exg
commit 9fa8cbe7a2
10 changed files with 201 additions and 103 deletions

View file

@ -22,6 +22,7 @@
#include "module-formats.h"
#include "signals.h"
#include "misc.h"
#include "recode.h"
#include "special-vars.h"
#include "settings.h"
@ -44,6 +45,7 @@
static void cmd_me(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item)
{
const char *target;
char *recoded;
CMD_IRC_SERVER(server);
if (!IS_IRC_ITEM(item))
@ -53,12 +55,15 @@ 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(SERVER(server), data, target);
signal_emit("message irc own_action", 3, server, data,
signal_emit("message irc own_action", 3, server, recoded,
item->visible_name);
irc_send_cmdv(server, "PRIVMSG %s :\001ACTION %s\001",
target, data);
target, recoded);
g_free(recoded);
}
/* SYNTAX: ACTION [-<server tag>] <target> <message> */
@ -66,6 +71,7 @@ static void cmd_action(const char *data, IRC_SERVER_REC *server)
{
GHashTable *optlist;
const char *target, *text;
char *recoded;
void *free_arg;
CMD_IRC_SERVER(server);
@ -81,10 +87,12 @@ static void cmd_action(const char *data, IRC_SERVER_REC *server)
if (server == NULL || !server->connected)
cmd_param_error(CMDERR_NOT_CONNECTED);
irc_send_cmdv(server, "PRIVMSG %s :\001ACTION %s\001", target, text);
recoded = recode_out(SERVER(server), text, target);
irc_send_cmdv(server, "PRIVMSG %s :\001ACTION %s\001", target, recoded);
signal_emit("message irc own_action", 3, server, text, target);
signal_emit("message irc own_action", 3, server, recoded, target);
g_free(recoded);
cmd_params_free(free_arg);
}
@ -92,6 +100,7 @@ static void cmd_notice(const char *data, IRC_SERVER_REC *server,
WI_ITEM_REC *item)
{
const char *target, *msg;
char *recoded;
void *free_arg;
CMD_IRC_SERVER(server);
@ -105,8 +114,10 @@ static void cmd_notice(const char *data, IRC_SERVER_REC *server,
if (*target == '\0' || *msg == '\0')
cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
signal_emit("message irc own_notice", 3, server, msg, target);
recoded = recode_out(SERVER(server), msg, target);
signal_emit("message irc own_notice", 3, server, recoded, target);
g_free(recoded);
cmd_params_free(free_arg);
}