summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>2004-09-12 13:12:34 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>2004-09-12 13:12:34 +0000
commit7974c252a06c6925101e2c76b6bfe4666667ed3b (patch)
tree5c2f352ba04eed459e6af249ae526d6269101142
parentff0c5bfe7cc5c826fdf430dd104870d90f50e2b2 (diff)
downloadirssi-7974c252a06c6925101e2c76b6bfe4666667ed3b.zip
Recent WHOIS changes broke nick's gone/oper flags. Patch by Valentin Batz
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@3290 dbcabf3a-b0e7-0310-adc4-f8d773084564
-rw-r--r--src/fe-common/irc/fe-whois.c3
-rw-r--r--src/irc/core/irc-commands.c2
-rw-r--r--src/irc/core/irc-nicklist.c8
3 files changed, 8 insertions, 5 deletions
diff --git a/src/fe-common/irc/fe-whois.c b/src/fe-common/irc/fe-whois.c
index 1e8fd4a6..b956b9de 100644
--- a/src/fe-common/irc/fe-whois.c
+++ b/src/fe-common/irc/fe-whois.c
@@ -327,7 +327,6 @@ struct whois_event_table {
static struct whois_event_table events[] = {
{ 312, event_whois_server },
- { 313, event_whois_oper },
{ 326, event_whois_usermode326 },
{ 327, event_whois_realhost327 },
{ 379, event_whois_modes },
@@ -360,6 +359,7 @@ void fe_whois_init(void)
signal_add("event 311", (SIGNAL_FUNC) event_whois);
signal_add("whois away", (SIGNAL_FUNC) event_whois_away);
+ signal_add("whois oper", (SIGNAL_FUNC) event_whois_oper);
signal_add("whowas away", (SIGNAL_FUNC) event_whois_away);
signal_add("whois default event", (SIGNAL_FUNC) event_whois_default);
signal_add("event 318", (SIGNAL_FUNC) event_end_of_whois);
@@ -371,6 +371,7 @@ void fe_whois_deinit(void)
{
signal_remove("event 311", (SIGNAL_FUNC) event_whois);
signal_remove("whois away", (SIGNAL_FUNC) event_whois_away);
+ signal_remove("whois oper", (SIGNAL_FUNC) event_whois_oper);
signal_remove("whowas away", (SIGNAL_FUNC) event_whois_away);
signal_remove("whois default event", (SIGNAL_FUNC) event_whois_default);
signal_remove("event 318", (SIGNAL_FUNC) event_end_of_whois);
diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c
index bdd45d3b..faea4c96 100644
--- a/src/irc/core/irc-commands.c
+++ b/src/irc/core/irc-commands.c
@@ -428,6 +428,7 @@ static void cmd_whois(const char *data, IRC_SERVER_REC *server,
"event 318", "whois end",
"event 402", event_402,
"event 301", "whois away", /* 301 can come as a reply to /MSG, /WHOIS or /WHOWAS */
+ "event 313", "whois oper",
"event 401", "whois not found",
"event 311", "whois event",
"", "whois default event", NULL);
@@ -436,6 +437,7 @@ static void cmd_whois(const char *data, IRC_SERVER_REC *server,
NULL,
"event 318", "whois end",
"event 301", "whois away", /* 301 can come as a reply to /MSG, /WHOIS or /WHOWAS */
+ "event 313", "whois oper",
"event 311", "whois event",
"", "whois default event", NULL);
}
diff --git a/src/irc/core/irc-nicklist.c b/src/irc/core/irc-nicklist.c
index 5d5accd6..c438ecbc 100644
--- a/src/irc/core/irc-nicklist.c
+++ b/src/irc/core/irc-nicklist.c
@@ -424,8 +424,8 @@ void irc_nicklist_init(void)
signal_add("silent event who", (SIGNAL_FUNC) event_who);
signal_add("silent event whois", (SIGNAL_FUNC) event_whois);
signal_add_first("event 311", (SIGNAL_FUNC) event_whois);
- signal_add_first("event 301", (SIGNAL_FUNC) event_whois_away);
- signal_add_first("event 313", (SIGNAL_FUNC) event_whois_ircop);
+ signal_add_first("whois away", (SIGNAL_FUNC) event_whois_away);
+ signal_add_first("whois oper", (SIGNAL_FUNC) event_whois_ircop);
signal_add_first("event 353", (SIGNAL_FUNC) event_names_list);
signal_add_first("event 366", (SIGNAL_FUNC) event_end_of_names);
signal_add_first("event 432", (SIGNAL_FUNC) event_nick_in_use);
@@ -444,8 +444,8 @@ void irc_nicklist_deinit(void)
signal_remove("silent event who", (SIGNAL_FUNC) event_who);
signal_remove("silent event whois", (SIGNAL_FUNC) event_whois);
signal_remove("event 311", (SIGNAL_FUNC) event_whois);
- signal_remove("event 301", (SIGNAL_FUNC) event_whois_away);
- signal_remove("event 313", (SIGNAL_FUNC) event_whois_ircop);
+ signal_remove("whois away", (SIGNAL_FUNC) event_whois_away);
+ signal_remove("whois oper", (SIGNAL_FUNC) event_whois_ircop);
signal_remove("event 353", (SIGNAL_FUNC) event_names_list);
signal_remove("event 366", (SIGNAL_FUNC) event_end_of_names);
signal_remove("event 432", (SIGNAL_FUNC) event_nick_in_use);