diff options
| author | Timo Sirainen <cras@irssi.org> | 2002-01-10 18:02:22 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2002-01-10 18:02:22 +0000 |
| commit | 9fffa58c203e37ff9a6cb853d40ce33a6edef6ea (patch) | |
| tree | 544ac4f814b16e00ddfe319fd193eea14f89eb4b /src/fe-common | |
| parent | 7131ceb909c5ffc614a8a9b40e80449a468fd78c (diff) | |
| download | irssi-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/fe-common')
| -rw-r--r-- | src/fe-common/irc/fe-events.c | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/src/fe-common/irc/fe-events.c b/src/fe-common/irc/fe-events.c index a4758c1d..03f37f0c 100644 --- a/src/fe-common/irc/fe-events.c +++ b/src/fe-common/irc/fe-events.c @@ -66,18 +66,14 @@ static void event_privmsg(IRC_SERVER_REC *server, const char *data, g_free(params); } -/* we use "ctcp msg" here because "ctcp msg action" can be ignored with - /IGNORE * CTCPS, and we don't want that.. */ -static void ctcp_msg_check_action(IRC_SERVER_REC *server, const char *data, - const char *nick, const char *addr, - const char *target) +static void ctcp_action(IRC_SERVER_REC *server, const char *data, + const char *nick, const char *addr, + const char *target) { g_return_if_fail(data != NULL); - if (g_strncasecmp(data, "ACTION ", 7) == 0) { - signal_emit("message irc action", 5, - server, data+7, nick, addr, target); - } + signal_emit("message irc action", 5, + server, data, nick, addr, target); } static void event_notice(IRC_SERVER_REC *server, const char *data, @@ -414,15 +410,10 @@ static void event_received(IRC_SERVER_REC *server, const char *data, g_free(params); } -static void sig_empty(void) -{ -} - void fe_events_init(void) { signal_add("event privmsg", (SIGNAL_FUNC) event_privmsg); - signal_add("ctcp msg", (SIGNAL_FUNC) ctcp_msg_check_action); - signal_add("ctcp msg action", (SIGNAL_FUNC) sig_empty); + signal_add("ctcp action", (SIGNAL_FUNC) ctcp_action); signal_add("event notice", (SIGNAL_FUNC) event_notice); signal_add("event join", (SIGNAL_FUNC) event_join); signal_add("event part", (SIGNAL_FUNC) event_part); @@ -451,8 +442,7 @@ void fe_events_init(void) void fe_events_deinit(void) { signal_remove("event privmsg", (SIGNAL_FUNC) event_privmsg); - signal_remove("ctcp msg", (SIGNAL_FUNC) ctcp_msg_check_action); - signal_remove("ctcp msg action", (SIGNAL_FUNC) sig_empty); + signal_remove("ctcp action", (SIGNAL_FUNC) ctcp_action); signal_remove("event notice", (SIGNAL_FUNC) event_notice); signal_remove("event join", (SIGNAL_FUNC) event_join); signal_remove("event part", (SIGNAL_FUNC) event_part); |