[Gaim-commits] SF.net SVN: gaim: [16930] trunk/libgaim/protocols/irc/irc.c

[<the...@us...>]

Revision: 16930
Author:   thekingant
Date:     2006-08-20 19:05:55 -0700 (Sun, 20 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16930&view=rev

Log Message:
-----------
And this needs to be done before calling gaim_connection_error().

The IRC PPRL should only free the sslconn if the connection is
canceled half-way through, or if the connection has completed and
the user signs offline.  If the connection fails normally
then sslconn.c is responsible for destroying the sslconn.

Modified Paths:
--------------
    trunk/libgaim/protocols/irc/irc.c
Modified: trunk/libgaim/protocols/irc/irc.c
===================================================================
--- trunk/libgaim/protocols/irc/irc.c	2006-08-21 02:01:38 UTC (rev 16929)
+++ trunk/libgaim/protocols/irc/irc.c	2006-08-21 02:05:55 UTC (rev 16930)
@@ -411,6 +411,8 @@
 	GaimConnection *gc = data;
 	struct irc_conn *irc = gc->proto_data;
 
+	irc->gsc = NULL;
+
 	switch(error) {
 		case GAIM_SSL_CONNECT_FAILED:
 			gaim_connection_error(gc, _("Connection Failed"));
@@ -419,8 +421,6 @@
 			gaim_connection_error(gc, _("SSL Handshake Failed"));
 			break;
 	}
-
-	irc->gsc = NULL;
 }
 
 static void irc_close(GaimConnection *gc)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.