zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-10 20:33:46 +02:00
Code Issues Projects Releases Packages Wiki Activity

Move output recoding in irc_send_cmd_full.

Browse source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4715 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Emanuele Giaquinta 2008-02-16 23:28:53 +00:00 • committed by exg
commit 0eb386ecd8
8 changed files with 46 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/fe-common/core/fe-messages.c
View file

@ -31,7 +31,6 @@
#include "channels.h"
#include "nicklist.h"
#include "ignore.h"
#include "recode.h"
#include "window-items.h"
#include "fe-queries.h"
@ -259,7 +258,7 @@ static void sig_message_own_public(SERVER_REC *server, const char *msg,
WINDOW_REC *window;
CHANNEL_REC *channel;
const char *nickmode;
char *freemsg = NULL, *recoded;
char *freemsg = NULL;
int print_channel;
channel = channel_find(server, target);
if (channel != NULL)
@ -280,18 +279,14 @@ static void sig_message_own_public(SERVER_REC *server, const char *msg,
if (settings_get_bool("emphasis"))
msg = freemsg = expand_emphasis((WI_ITEM_REC *) channel, msg);
/* ugly: recode the sent message back for printing */
recoded = recode_in(server, msg, target);
if (!print_channel) {
printformat(server, target, MSGLEVEL_PUBLIC | MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT,
TXT_OWN_MSG, server->nick, recoded, nickmode);
TXT_OWN_MSG, server->nick, msg, nickmode);
} else {
printformat(server, target, MSGLEVEL_PUBLIC | MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT,
TXT_OWN_MSG_CHANNEL, server->nick, target, recoded, nickmode);
TXT_OWN_MSG_CHANNEL, server->nick, target, msg, nickmode);
}
g_free(recoded);
g_free_not_null(freemsg);
}
@ -299,7 +294,7 @@ static void sig_message_own_private(SERVER_REC *server, const char *msg,
const char *target, const char *origtarget)
{
QUERY_REC *query;
char *freemsg = NULL, *recoded;
char *freemsg = NULL;
g_return_if_fail(server != NULL);
g_return_if_fail(msg != NULL);
@ -322,15 +317,11 @@ static void sig_message_own_private(SERVER_REC *server, const char *msg,
if (settings_get_bool("emphasis"))
msg = freemsg = expand_emphasis((WI_ITEM_REC *) query, msg);
/* ugly: recode the sent message back for printing */
recoded = recode_in(server, msg, target);
printformat(server, target,
MSGLEVEL_MSGS | MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT,
query == NULL ? TXT_OWN_MSG_PRIVATE :
TXT_OWN_MSG_PRIVATE_QUERY, target, recoded, server->nick);
TXT_OWN_MSG_PRIVATE_QUERY, target, msg, server->nick);
g_free(recoded);
g_free_not_null(freemsg);
}
@ -411,7 +402,6 @@ static void sig_message_quit(SERVER_REC *server, const char *nick,
if (once || count == 0) {
if (chans->len > 0)
g_string_truncate(chans, chans->len-1);
/* at least recode_fallback will be used */
printformat(server, print_channel, MSGLEVEL_QUITS,
count <= 1 ? TXT_QUIT : TXT_QUIT_ONCE,
nick, address, reason, chans->str);