/pidgin/main: 9a21b3ce6ed7: Followup on 639ec03ba1ba related to ...

Daniel Atallah datallah at pidgin.im
Tue Jan 28 10:38:16 EST 2014


Changeset: 9a21b3ce6ed7209d0d5fe7fcaa843c23bf8fa79c
Author:	 Daniel Atallah <datallah at pidgin.im>
Date:	 2014-01-21 21:50 -0500
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/9a21b3ce6ed7

Description:

Followup on 639ec03ba1ba related to the IRC security fixes - also fix debugging

Refs #15451

diffstat:

 libpurple/protocols/irc/msgs.c  |  2 +-
 libpurple/protocols/irc/parse.c |  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (24 lines):

diff --git a/libpurple/protocols/irc/msgs.c b/libpurple/protocols/irc/msgs.c
--- a/libpurple/protocols/irc/msgs.c
+++ b/libpurple/protocols/irc/msgs.c
@@ -387,7 +387,7 @@ void irc_msg_whois(struct irc_conn *irc,
 	} else if (!strcmp(name, "320")) {
 		irc->whois.identified = 1;
 	} else if (!strcmp(name, "330")) {
-		g_message("msg %s: 1=[%s] 2=[%s] 3=[%s]",
+		purple_debug(PURPLE_DEBUG_INFO, "irc", "330 %s: 1=[%s] 2=[%s] 3=[%s]",
 				name, args[1], args[2], args[3]);
 		if (!strcmp(args[3], "is logged in as"))
 			irc->whois.login = g_strdup(args[2]);
diff --git a/libpurple/protocols/irc/parse.c b/libpurple/protocols/irc/parse.c
--- a/libpurple/protocols/irc/parse.c
+++ b/libpurple/protocols/irc/parse.c
@@ -69,7 +69,7 @@ static struct _irc_msg {
 	{ "318", "nt:", 2, irc_msg_endwhois },		/* End of WHOIS			*/
 	{ "319", "nn:", 3, irc_msg_whois },		/* Whois channels		*/
 	{ "320", "nn:", 2, irc_msg_whois },		/* Whois (fn ident)		*/
-	{ "330", "nnv:", irc_msg_whois },	/* Whois (fn login)		*/
+	{ "330", "nnv:", 4, irc_msg_whois },		/* Whois (fn login)		*/
 	{ "314", "nnnvv:", 6, irc_msg_whois },		/* Whowas user			*/
 	{ "315", "nt:", 0, irc_msg_who },		/* end of WHO channel		*/
 	{ "369", "nt:", 2, irc_msg_endwhois },		/* End of WHOWAS		*/



More information about the Commits mailing list