aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2025-01-03 14:56:47 -05:00
Code

fixed recode for actions and added recode for numeric events

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4041 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Valentin Batz 2005-10-15 18:45:25 +00:00 committed by vb
parent 674eec8fd2
commit 4a7107437d
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/fe-common/irc/fe-events-numeric.c
View File

@ -505,7 +505,7 @@ static void event_numeric(IRC_SERVER_REC *server, const char *data,
static void print_event_received(IRC_SERVER_REC *server, const char *data, static void print_event_received(IRC_SERVER_REC *server, const char *data,
const char *nick, int target_param) const char *nick, int target_param)
{ {
char *target, *args, *ptr; char *target, *args, *ptr, *recoded;
int format; int format;
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
@ -540,11 +540,14 @@ static void print_event_received(IRC_SERVER_REC *server, const char *data,
g_memmove(ptr+1, ptr+2, strlen(ptr+1)); g_memmove(ptr+1, ptr+2, strlen(ptr+1));
} }
recoded = recode_in(SERVER(server), args, NULL);
format = nick == NULL || server->real_address == NULL || format = nick == NULL || server->real_address == NULL ||
strcmp(nick, server->real_address) == 0 ? strcmp(nick, server->real_address) == 0 ?
IRCTXT_DEFAULT_EVENT : IRCTXT_DEFAULT_EVENT_SERVER; IRCTXT_DEFAULT_EVENT : IRCTXT_DEFAULT_EVENT_SERVER;
printformat(server, target, MSGLEVEL_CRAP, format, printformat(server, target, MSGLEVEL_CRAP, format,
nick, args, current_server_event); nick, recoded, current_server_event);
g_free(recoded);
g_free(args); g_free(args);
g_free(target); g_free(target);
} }

27
src/fe-common/irc/fe-irc-messages.c
View File

@ -147,7 +147,7 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
const char *target) const char *target)
{ {
void *item; void *item;
char *freemsg = NULL; char *freemsg = NULL, *recoded;
int level; int level;
level = MSGLEVEL_ACTIONS | level = MSGLEVEL_ACTIONS |
@ -164,27 +164,29 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg,
if (settings_get_bool("emphasis")) if (settings_get_bool("emphasis"))
msg = freemsg = expand_emphasis(item, msg); msg = freemsg = expand_emphasis(item, msg);
recoded = recode_in(SERVER(server), msg, target);
if (ischannel(*target)) { if (ischannel(*target)) {
/* channel action */ /* channel action */
if (window_item_is_active(item)) { if (window_item_is_active(item)) {
/* message to active channel in window */ /* message to active channel in window */
printformat(server, target, level, printformat(server, target, level,
IRCTXT_ACTION_PUBLIC, nick, msg); IRCTXT_ACTION_PUBLIC, nick, recoded);
} else { } else {
/* message to not existing/active channel */ /* message to not existing/active channel */
printformat(server, target, level, printformat(server, target, level,
IRCTXT_ACTION_PUBLIC_CHANNEL, IRCTXT_ACTION_PUBLIC_CHANNEL,
nick, target, msg); nick, target, recoded);
} }
} else { } else {
/* private action */ /* private action */
printformat(server, nick, MSGLEVEL_ACTIONS | MSGLEVEL_MSGS, printformat(server, nick, MSGLEVEL_ACTIONS | MSGLEVEL_MSGS,
item == NULL ? IRCTXT_ACTION_PRIVATE : item == NULL ? IRCTXT_ACTION_PRIVATE :
IRCTXT_ACTION_PRIVATE_QUERY, IRCTXT_ACTION_PRIVATE_QUERY,
nick, address == NULL ? "" : address, msg); nick, address == NULL ? "" : address, recoded);
} }
g_free_not_null(freemsg); g_free(recoded);
g_free_not_null(freemsg);
} }
static void sig_message_own_notice(IRC_SERVER_REC *server, const char *msg, static void sig_message_own_notice(IRC_SERVER_REC *server, const char *msg,
@ -203,17 +205,20 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
const char *target) const char *target)
{ {
const char *oldtarget; const char *oldtarget;
char *recoded;
oldtarget = target; oldtarget = target;
target = skip_target(target); target = skip_target(target);
if (address == NULL || *address == '\0') { if (address == NULL || *address == '\0') {
/* notice from server */ /* notice from server */
recoded = recode_in(SERVER(server), msg, NULL);
if (!ignore_check(server, nick, "", if (!ignore_check(server, nick, "",
target, msg, MSGLEVEL_SNOTES)) { target, msg, MSGLEVEL_SNOTES)) {
printformat(server, target, MSGLEVEL_SNOTES, printformat(server, target, MSGLEVEL_SNOTES,
IRCTXT_NOTICE_SERVER, nick, msg); IRCTXT_NOTICE_SERVER, nick, msg);
} }
g_free(recoded);
return; return;
} }
@ -222,17 +227,19 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg,
msg, MSGLEVEL_NOTICES)) msg, MSGLEVEL_NOTICES))
return; return;
if (ischannel(*target)) { recoded = recode_in(SERVER(server), msg, target);
if (ischannel(*target)) {
/* notice in some channel */ /* notice in some channel */
printformat(server, target, MSGLEVEL_NOTICES, printformat(server, target, MSGLEVEL_NOTICES,
IRCTXT_NOTICE_PUBLIC, nick, oldtarget, msg); IRCTXT_NOTICE_PUBLIC, nick, oldtarget, recoded);
} else { } else {
/* private notice */ /* private notice */
privmsg_get_query(SERVER(server), nick, FALSE, privmsg_get_query(SERVER(server), nick, FALSE,
MSGLEVEL_NOTICES); MSGLEVEL_NOTICES);
printformat(server, nick, MSGLEVEL_NOTICES, printformat(server, nick, MSGLEVEL_NOTICES,
IRCTXT_NOTICE_PRIVATE, nick, address, msg); IRCTXT_NOTICE_PRIVATE, nick, address, recoded);
} }
g_free(recoded);
} }
static void sig_message_own_ctcp(IRC_SERVER_REC *server, const char *cmd, static void sig_message_own_ctcp(IRC_SERVER_REC *server, const char *cmd,