diff options
| author | Timo Sirainen <cras@irssi.org> | 2002-10-14 15:18:32 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2002-10-14 15:18:32 +0000 |
| commit | 4ed5e9adf6a353625b956c167188ecd3b1b11de2 (patch) | |
| tree | e4b0d7acef71d109204ff132fe0f6893a8261731 /src/fe-common | |
| parent | fae3ae2bfcab714da40bcf1315fb990e14ec3645 (diff) | |
| download | irssi-4ed5e9adf6a353625b956c167188ecd3b1b11de2.zip | |
Correct handling of /NOTICE @#channel, patch by dg
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2948 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/fe-common')
| -rw-r--r-- | src/fe-common/irc/fe-irc-commands.c | 1 | ||||
| -rw-r--r-- | src/fe-common/irc/fe-irc-messages.c | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/fe-common/irc/fe-irc-commands.c b/src/fe-common/irc/fe-irc-commands.c index e0377542..b1752d9d 100644 --- a/src/fe-common/irc/fe-irc-commands.c +++ b/src/fe-common/irc/fe-irc-commands.c @@ -114,7 +114,6 @@ static void cmd_notice(const char *data, IRC_SERVER_REC *server, if (*target == '\0' || *msg == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS); - target = skip_target(target); signal_emit("message irc own_notice", 3, server, msg, target); cmd_params_free(free_arg); } diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c index 79823864..a62653cf 100644 --- a/src/fe-common/irc/fe-irc-messages.c +++ b/src/fe-common/irc/fe-irc-messages.c @@ -179,7 +179,7 @@ static void sig_message_irc_action(IRC_SERVER_REC *server, const char *msg, static void sig_message_own_notice(IRC_SERVER_REC *server, const char *msg, const char *target) { - printformat(server, target, MSGLEVEL_NOTICES | + printformat(server, skip_target(target), MSGLEVEL_NOTICES | MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT, IRCTXT_OWN_NOTICE, target, msg); } @@ -190,6 +190,9 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg, { const char *oldtarget; + oldtarget = target; + target = skip_target(target); + if (address == NULL || *address == '\0') { /* notice from server */ if (!ignore_check(server, nick, "", @@ -200,9 +203,6 @@ static void sig_message_irc_notice(SERVER_REC *server, const char *msg, return; } - oldtarget = target; - target = skip_target(target); - if (ignore_check(server, nick, address, ischannel(*target) ? target : NULL, msg, MSGLEVEL_NOTICES)) |