From acf60a729c81b226f7126a94d1c8092f29fec3ca Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Mon, 1 Jan 2001 14:42:22 +0000 Subject: [PATCH] small extra checks to /whois redirect checking git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1039 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- src/irc/core/irc-commands.c | 9 ++++++--- src/irc/notifylist/notify-ison.c | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c index 945bd1cf..25c36aef 100644 --- a/src/irc/core/irc-commands.c +++ b/src/irc/core/irc-commands.c @@ -509,7 +509,7 @@ static void cmd_whois(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item) { GHashTable *optlist; - char *qserver, *query, *event_402; + char *qserver, *query, *event_402, *str; void *free_arg; int free_nick; @@ -549,11 +549,14 @@ static void cmd_whois(const char *data, IRC_SERVER_REC *server, /* do automatic /WHOWAS if any of the nicks wasn't found */ query = get_redirect_nicklist(query, &free_nick); - server_redirect_event(SERVER(server), query, 3, + str = g_strconcat(qserver, " ", query, NULL); + server_redirect_event(SERVER(server), str, 2, "event 318", "event 318", 1, - "event 402", event_402, -1, + "event 402", event_402, 1, "event 401", "whois not found", 1, "event 311", "whois event", 1, NULL); + g_free(str); + if (free_nick) g_free(query); cmd_params_free(free_arg); } diff --git a/src/irc/notifylist/notify-ison.c b/src/irc/notifylist/notify-ison.c index 604c1804..8096c5a9 100644 --- a/src/irc/notifylist/notify-ison.c +++ b/src/irc/notifylist/notify-ison.c @@ -186,7 +186,7 @@ static void whois_send(IRC_SERVER_REC *server, char *nicks) server_redirect_event((SERVER_REC *) server, str, 2, "event 318", "notifylist event whois end", 1, - "event 402", "event empty", -1, + "event 402", "event empty", 1, "event 401", "event empty", 1, "event 311", "notifylist event whois", 1, "event 301", "notifylist event whois away", 1,