summaryrefslogtreecommitdiff
path: root/src/irc
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>2002-01-10 18:02:22 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>2002-01-10 18:02:22 +0000
commit9fffa58c203e37ff9a6cb853d40ce33a6edef6ea (patch)
tree544ac4f814b16e00ddfe319fd193eea14f89eb4b /src/irc
parent7131ceb909c5ffc614a8a9b40e80449a468fd78c (diff)
downloadirssi-9fffa58c203e37ff9a6cb853d40ce33a6edef6ea.zip
Actions are now sent in "ctcp action" signal which is never ignored. "ctcp
msg action" doesn't work anymore nor does it show in "ctcp msg"s. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2303 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/irc')
-rw-r--r--src/irc/core/ctcp.c7
-rw-r--r--src/irc/core/irc-queries.c29
2 files changed, 29 insertions, 7 deletions
diff --git a/src/irc/core/ctcp.c b/src/irc/core/ctcp.c
index 51738438..5b52fb71 100644
--- a/src/irc/core/ctcp.c
+++ b/src/irc/core/ctcp.c
@@ -224,6 +224,13 @@ static void ctcp_msg(IRC_SERVER_REC *server, const char *data,
{
char *args, *str;
+ if (g_strncasecmp(data, "ACTION ", 7) == 0) {
+ /* special treatment for actions */
+ signal_emit("ctcp action", 5, server, data+7,
+ nick, addr, target);
+ return;
+ }
+
if (ignore_check(SERVER(server), nick, addr, target, data, MSGLEVEL_CTCPS))
return;
diff --git a/src/irc/core/irc-queries.c b/src/irc/core/irc-queries.c
index 380b12ef..402aa75d 100644
--- a/src/irc/core/irc-queries.c
+++ b/src/irc/core/irc-queries.c
@@ -40,15 +40,10 @@ QUERY_REC *irc_query_create(const char *server_tag,
return rec;
}
-static void event_privmsg(IRC_SERVER_REC *server, const char *data,
- const char *nick, const char *address)
+static void check_address_change(IRC_SERVER_REC *server, const char *nick,
+ const char *address, const char *target)
{
QUERY_REC *query;
- char *params, *target, *msg;
-
- g_return_if_fail(data != NULL);
-
- params = event_get_params(data, 2 | PARAM_FLAG_GETREST, &target, &msg);
if (address != NULL && !ischannel(*target)) {
/* save nick's address to query */
@@ -57,10 +52,28 @@ static void event_privmsg(IRC_SERVER_REC *server, const char *data,
strcmp(query->address, address) != 0))
query_change_address(query, address);
}
+}
+
+static void event_privmsg(IRC_SERVER_REC *server, const char *data,
+ const char *nick, const char *address)
+{
+ char *params, *target, *msg;
+
+ g_return_if_fail(data != NULL);
+ params = event_get_params(data, 2 | PARAM_FLAG_GETREST, &target, &msg);
+ check_address_change(server, nick, address, target);
g_free(params);
}
+static void ctcp_action(IRC_SERVER_REC *server, const char *msg,
+ const char *nick, const char *address,
+ const char *target)
+{
+ check_address_change(server, nick, address, target);
+}
+
+
static void event_nick(SERVER_REC *server, const char *data,
const char *orignick)
{
@@ -78,11 +91,13 @@ static void event_nick(SERVER_REC *server, const char *data,
void irc_queries_init(void)
{
signal_add_last("event privmsg", (SIGNAL_FUNC) event_privmsg);
+ signal_add_last("ctcp action", (SIGNAL_FUNC) ctcp_action);
signal_add("event nick", (SIGNAL_FUNC) event_nick);
}
void irc_queries_deinit(void)
{
signal_remove("event privmsg", (SIGNAL_FUNC) event_privmsg);
+ signal_remove("ctcp action", (SIGNAL_FUNC) ctcp_action);
signal_remove("event nick", (SIGNAL_FUNC) event_nick);
}