From 92933dace3d9e6d65a407175a8c879be3cdc0843 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Thu, 27 Dec 2001 11:38:46 +0000 Subject: [PATCH] Server parameter is sent now too with /WHO, though the format itself wasn't changed. patch by peder. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2282 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- src/fe-common/irc/fe-events-numeric.c | 5 +++-- src/fe-common/irc/module-formats.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c index 317a4526..8f0297d0 100644 --- a/src/fe-common/irc/fe-events-numeric.c +++ b/src/fe-common/irc/fe-events-numeric.c @@ -97,11 +97,12 @@ static void event_end_of_names(IRC_SERVER_REC *server, const char *data) static void event_who(IRC_SERVER_REC *server, const char *data) { char *params, *nick, *channel, *user, *host, *stat, *realname, *hops; + char *serv; g_return_if_fail(data != NULL); params = event_get_params(data, 8, NULL, &channel, &user, - &host, NULL, &nick, &stat, &realname); + &host, &serv, &nick, &stat, &realname); /* split hops/realname */ hops = realname; @@ -110,7 +111,7 @@ static void event_who(IRC_SERVER_REC *server, const char *data) if (realname > hops) realname[-1] = '\0'; printformat(server, NULL, MSGLEVEL_CRAP, IRCTXT_WHO, - channel, nick, stat, hops, user, host, realname); + channel, nick, stat, hops, user, host, realname, serv); g_free(params); } diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c index 452f18d6..96d6628e 100644 --- a/src/fe-common/irc/module-formats.c +++ b/src/fe-common/irc/module-formats.c @@ -110,7 +110,7 @@ FORMAT_REC fecommon_irc_formats[] = { { "end_of_whois", "End of WHOIS", 1, { 0 } }, { "end_of_whowas", "End of WHOWAS", 1, { 0 } }, { "whois_not_found", "There is no such nick $0", 1, { 0 } }, - { "who", "{channelhilight $[-10]0} %|{nick $[!9]1} $[!3]2 $[!2]3 $4@$5 {comment {hilight $6}}", 7, { 0, 0, 0, 0, 0, 0, 0 } }, + { "who", "{channelhilight $[-10]0} %|{nick $[!9]1} $[!3]2 $[!2]3 $4@$5 {comment {hilight $6}}", 8, { 0, 0, 0, 0, 0, 0, 0, 0 } }, { "end_of_who", "End of /WHO list", 1, { 0 } }, /* ---- */