# HG changeset patch
# User Ethan Blanton <elb@pidgin.im>
# Date 1108700573 0
# Node ID 6239870efd8ececfcbf10183d16c9b0e0039af5c
# Parent  adf7adc7da76395db560668836b2d7e7850294cf
[gaim-migrate @ 12055]
Two-argument whois from rlaager, ported forward from oldstatus

committer: Tailor Script <tailor@pidgin.im>

diff -r adf7adc7da76 -r 6239870efd8e src/protocols/irc/cmds.c
--- a/src/protocols/irc/cmds.c	Thu Feb 17 17:37:59 2005 +0000
+++ b/src/protocols/irc/cmds.c	Fri Feb 18 04:22:53 2005 +0000
@@ -503,10 +503,16 @@
 	if (!args || !args[0])
 		return 0;
 
-	buf = irc_format(irc, "vn", "WHOIS", args[0]);
+	if (args[1]) {
+		buf = irc_format(irc, "vvn", "WHOIS", args[0], args[1]);
+		irc->whois.nick = g_strdup(args[1]);
+	} else {
+		buf = irc_format(irc, "vn", "WHOIS", args[0]);
+		irc->whois.nick = g_strdup(args[0]);
+	}
+
 	irc_send(irc, buf);
 	g_free(buf);
-	irc->whois.nick = g_strdup(args[0]);
 
 	return 0;
 }
diff -r adf7adc7da76 -r 6239870efd8e src/protocols/irc/parse.c
--- a/src/protocols/irc/parse.c	Thu Feb 17 17:37:59 2005 +0000
+++ b/src/protocols/irc/parse.c	Fri Feb 18 04:22:53 2005 +0000
@@ -118,7 +118,7 @@
 	{ "kick", "n:", irc_cmd_kick, N_("kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this.") },
 	{ "list", ":", irc_cmd_list, N_("list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>") },
 	{ "me", ":", irc_cmd_ctcp_action, N_("me &lt;action to perform&gt;:  Perform an action.") },
-	{ "mode", ":", irc_cmd_mode, N_("mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a channel or user mode.") },
+	{ "mode", ":", irc_cmd_mode, N_("mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel or user mode.") },
 	{ "msg", "t:", irc_cmd_privmsg, N_("msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel).") },
 	{ "names", "c", irc_cmd_names, N_("names [channel]:  List the users currently in a channel.") },
 	{ "nick", "n", irc_cmd_nick, N_("nick &lt;new nickname&gt;:  Change your nickname.") },
@@ -135,7 +135,7 @@
 	{ "umode", ":", irc_cmd_mode, N_("umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode.") },
 	{ "voice", ":", irc_cmd_op, N_("voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this.") },
 	{ "wallops", ":", irc_cmd_wallops, N_("wallops &lt;message&gt;:  If you don't know what this is, you probably can't use it.") },
-	{ "whois", "n", irc_cmd_whois, N_("whois &lt;nick&gt;:  Get information on a user.") },
+	{ "whois", "tt", irc_cmd_whois, N_("whois [server] &lt;nick&gt;:  Get information on a user.") },
 	{ NULL, NULL, NULL }
 };