summaryrefslogtreecommitdiff
path: root/src/fe-common/irc/fe-irc-messages.c
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>2002-10-14 15:18:32 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>2002-10-14 15:18:32 +0000
commit4ed5e9adf6a353625b956c167188ecd3b1b11de2 (patch)
treee4b0d7acef71d109204ff132fe0f6893a8261731 /src/fe-common/irc/fe-irc-messages.c
parentfae3ae2bfcab714da40bcf1315fb990e14ec3645 (diff)
downloadirssi-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/irc/fe-irc-messages.c')
-rw-r--r--src/fe-common/irc/fe-irc-messages.c8
1 files changed, 4 insertions, 4 deletions
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))