Mercurial > pidgin

diff src/protocols/oscar/peer_proxy.c @ 14104:b0566d50291f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 16735] Oscar peer connections now use the proxy_connect_cancel() function, so they don't need to use GAIM_CONNECTION_IS_VALID() anymore. Also, peer connection attempts will time out after 15 seconds. Yay. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sun, 13 Aug 2006 08:41:07 +0000
parents 10e8eb6a4910
children a21da42126d6
line wrap: on
line diff
--- a/src/protocols/oscar/peer_proxy.c	Sun Aug 13 08:38:02 2006 +0000
+++ b/src/protocols/oscar/peer_proxy.c	Sun Aug 13 08:41:07 2006 +0000
@@ -328,21 +328,11 @@
 void
 peer_proxy_connection_established_cb(gpointer data, gint source)
 {
-	NewPeerConnectionData *new_conn_data;
-	GaimConnection *gc;
 	PeerConnection *conn;
 
-	new_conn_data = data;
-	gc = new_conn_data->gc;
-	conn = new_conn_data->conn;
-	g_free(new_conn_data);
+	conn = data;
 
-	if (!GAIM_CONNECTION_IS_VALID(gc))
-	{
-		if (source >= 0)
-			close(source);
-		return;
-	}
+	conn->connect_info = NULL;
 
 	if (source < 0)
 	{