diff options
| author | Emanuele Giaquinta <exg@irssi.org> | 2008-02-16 23:28:53 +0000 |
|---|---|---|
| committer | exg <exg@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2008-02-16 23:28:53 +0000 |
| commit | 0eb386ecd88140863c6377ef18764844103b68d9 (patch) | |
| tree | ca109e2b94b304495408e6bacdbe189ec3289f9f /src/fe-common/irc/fe-irc-commands.c | |
| parent | a0400dc3d23c01655b15a4486f8bd5b3c97b75cc (diff) | |
| download | irssi-0eb386ecd88140863c6377ef18764844103b68d9.zip | |
Move output recoding in irc_send_cmd_full.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4715 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/fe-common/irc/fe-irc-commands.c')
| -rw-r--r-- | src/fe-common/irc/fe-irc-commands.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/src/fe-common/irc/fe-irc-commands.c b/src/fe-common/irc/fe-irc-commands.c index 37f8b9ab..54c5263f 100644 --- a/src/fe-common/irc/fe-irc-commands.c +++ b/src/fe-common/irc/fe-irc-commands.c @@ -22,7 +22,6 @@ #include "module-formats.h" #include "signals.h" #include "misc.h" -#include "recode.h" #include "special-vars.h" #include "settings.h" @@ -45,7 +44,6 @@ 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)) @@ -55,15 +53,12 @@ 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, recoded, + signal_emit("message irc own_action", 3, server, data, item->visible_name); irc_send_cmdv(server, "PRIVMSG %s :\001ACTION %s\001", - target, recoded); - - g_free(recoded); + target, data); } /* SYNTAX: ACTION [-<server tag>] <target> <message> */ @@ -71,7 +66,6 @@ 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); @@ -87,12 +81,10 @@ 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(SERVER(server), text, target); - irc_send_cmdv(server, "PRIVMSG %s :\001ACTION %s\001", target, recoded); + irc_send_cmdv(server, "PRIVMSG %s :\001ACTION %s\001", target, text); - signal_emit("message irc own_action", 3, server, recoded, target); + signal_emit("message irc own_action", 3, server, text, target); - g_free(recoded); cmd_params_free(free_arg); } @@ -100,7 +92,6 @@ 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); @@ -114,10 +105,8 @@ 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(SERVER(server), msg, target); - signal_emit("message irc own_notice", 3, server, recoded, target); + signal_emit("message irc own_notice", 3, server, msg, target); - g_free(recoded); cmd_params_free(free_arg); } |