changeset 17097:31c49d31edea

Oops; I made some errors in the last commit. This is a fix of my commit of xjoe's patch to correct signon to dircproxy IRC proxies. Fixes: #1019
author Ethan Blanton <elb@pidgin.im>
date Tue, 15 May 2007 17:19:47 +0000
parents 7a88187629ff
children b079dad9d569
files ChangeLog libpurple/protocols/irc/msgs.c
diffstat 2 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue May 15 17:13:00 2007 +0000
+++ b/ChangeLog	Tue May 15 17:19:47 2007 +0000
@@ -30,6 +30,7 @@
 	* File transfer progress for transfers on MSN is now correctly displayed
 	* You can set/change alias of buddies/chats by double-clicking on the
 	  conversation tabs. (Ma Xuan)
+	* Fix IRC connection bug with dircproxy (xjoe)
 
 	Finch:
 	* Userlist in chat windows, which can be turned on or off using
--- a/libpurple/protocols/irc/msgs.c	Tue May 15 17:13:00 2007 +0000
+++ b/libpurple/protocols/irc/msgs.c	Tue May 15 17:19:47 2007 +0000
@@ -71,7 +71,7 @@
 	g_free(message);
 }
 
-static void irc_connected(struct irc_conn *irc, const char *nick);
+static void irc_connected(struct irc_conn *irc, const char *nick)
 {
 	PurpleConnection *gc;
 	PurpleStatus *status;
@@ -145,14 +145,10 @@
 	if (!args || !args[0])
 		return;
 
-	gc = purple_account_get_connection(irc->account);
-	if (!gc)
-		return;
-
 	if (!strcmp(name, "251")) {
 		/* 251 is required, so we pluck our nick from here and
 		 * finalize connection */
-		irc_connected(irc, args[0])
+		irc_connected(irc, args[0]);
 		/* Some IRC servers seem to not send a 255 numeric, so
 		 * I guess we can't require it; 251 will do. */
 	/* } else if (!strcmp(name, "255")) { */