From 969cfe8abcdff1047696c22e13c79c1f4c239137 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Fri, 12 May 2000 15:37:34 +0000 Subject: [PATCH] Display CTCP REPLY in a channel with a different text format than private CTCP replies git-svn-id: http://svn.irssi.org/repos/irssi/trunk@215 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- src/fe-common/irc/fe-ctcp.c | 2 +- src/fe-common/irc/module-formats.c | 1 + src/fe-common/irc/module-formats.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/fe-common/irc/fe-ctcp.c b/src/fe-common/irc/fe-ctcp.c index d06e1185..7a9c7cc5 100644 --- a/src/fe-common/irc/fe-ctcp.c +++ b/src/fe-common/irc/fe-ctcp.c @@ -71,7 +71,7 @@ static void ctcp_default_reply(const char *data, IRC_SERVER_REC *server, const c if (ptr != NULL) *ptr++ = '\0'; else ptr = ""; printformat(server, ischannel(*target) ? target : nick, MSGLEVEL_CTCPS, - IRCTXT_CTCP_REPLY, str, nick, ptr); + ischannel(*target) ? IRCTXT_CTCP_REPLY_CHANNEL : IRCTXT_CTCP_REPLY, str, nick, ptr, target); g_free(str); } diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c index 0319bc34..0a76bb22 100644 --- a/src/fe-common/irc/module-formats.c +++ b/src/fe-common/irc/module-formats.c @@ -161,6 +161,7 @@ FORMAT_REC fecommon_irc_formats[] = { NULL, "CTCPs", 0 }, { "ctcp_reply", "CTCP %_$0%_ reply from %_$1%_%K:%n $2", 3, { 0, 0, 0 } }, + { "ctcp_reply_channel", "CTCP %_$0%_ reply from %_$1%_ in channel %_$4%_%K:%n $2", 4, { 0, 0, 0, 0 } }, { "ctcp_ping_reply", "CTCP %_PING%_ reply from %_$0%_: $1.$2 seconds", 3, { 0, 2, 2 } }, { "ctcp_requested", "%g>>> %_$0%_ %K[%g$1%K] %grequested %_$2%_ from %_$3", 4, { 0, 0, 0, 0 } }, diff --git a/src/fe-common/irc/module-formats.h b/src/fe-common/irc/module-formats.h index d75ca9c4..ea615d2d 100644 --- a/src/fe-common/irc/module-formats.h +++ b/src/fe-common/irc/module-formats.h @@ -132,6 +132,7 @@ enum { IRCTXT_FILL_8, IRCTXT_CTCP_REPLY, + IRCTXT_CTCP_REPLY_CHANNEL, IRCTXT_CTCP_PING_REPLY, IRCTXT_CTCP_REQUESTED,