- rename "whois not found" to "whois try whowas", because that's what needs to be done when the signal is sent (and it doesn't mean whois_not_found should be printed)

- rename "whois event noserver" to "whois event not found", because the signal means the nickname wasn't found (but it comes as a "no such server" because it was a /whois nick nick), whois_not_found should be printed, and so it makes sense to also use it for the next fix:
- send "whois event not found" for 401, when auto_whowas is off, so the message is displayed correctly (Bug 295)
- handle 402 the same with auto_whowas off as with on, (fixes /whois with not existing server specified, with auto_whowas off).
- and since the auto_whowas on and off cases are similar now, merge them together, so they stay consistent.

- pass every argument given to /whowas to the server, not just the first (count). Fixes remote whowas (Bug 256)


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@3988 dbcabf3a-b0e7-0310-adc4-f8d773084564

1 files changed, 3 insertions, 3 deletions

diff --git a/src/fe-common/irc/fe-events.c b/src/fe-common/irc/fe-events.c
index 251779d6..8af264dd 100644
--- a/src/fe-common/irc/fe-events.c
+++ b/src/fe-common/irc/fe-events.c
@@ -386,7 +386,7 @@ static void event_ban_type_changed(void *ban_typep)
 	}
 }
 
-static void sig_whois_event_no_server(IRC_SERVER_REC *server, const char *data)
+static void sig_whois_event_not_found(IRC_SERVER_REC *server, const char *data)
 {
 	char *params, *nick;
 
@@ -451,7 +451,7 @@ void fe_events_init(void)
 	signal_add("event connected", (SIGNAL_FUNC) event_connected);
 	signal_add("nickfind event whois", (SIGNAL_FUNC) event_nickfind_whois);
 	signal_add("ban type changed", (SIGNAL_FUNC) event_ban_type_changed);
-	signal_add("whois event noserver", (SIGNAL_FUNC) sig_whois_event_no_server);
+	signal_add("whois event not found", (SIGNAL_FUNC) sig_whois_event_not_found);
 	signal_add("whowas event end", (SIGNAL_FUNC) sig_whowas_event_end);
 }
 
@@ -480,6 +480,6 @@ void fe_events_deinit(void)
 	signal_remove("event connected", (SIGNAL_FUNC) event_connected);
 	signal_remove("nickfind event whois", (SIGNAL_FUNC) event_nickfind_whois);
 	signal_remove("ban type changed", (SIGNAL_FUNC) event_ban_type_changed);
-	signal_remove("whois event noserver", (SIGNAL_FUNC) sig_whois_event_no_server);
+	signal_remove("whois event not found", (SIGNAL_FUNC) sig_whois_event_not_found);
 	signal_remove("whowas event end", (SIGNAL_FUNC) sig_whowas_event_end);
 }