cpw.malu.xmpp.jingle_ft: f8c427ef: Reset the connect timeout when the proxy...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: f8c427ef524d01d3dffb3dcbc7f0c52fa490ae4f
Ancestor: 844044025428d137372717a0ec39282b6853e595
Author: malu at pidgin.im
Date: 2009-05-11T17:10:39
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/f8c427ef524d01d3dffb3dcbc7f0c52fa490ae4f

Modified files:
        libpurple/protocols/jabber/jingle/s5b.c

ChangeLog: 

Reset the connect timeout when the proxy connect callback is invoked.
This will hopefully fix a crash happening when the callback is called on
failure (and the timeout callback is triggered to try the next 
streamhost).

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jingle/s5b.c	8fcc2c234d47cf0aa75ab70c8c685de27742d364
+++ libpurple/protocols/jabber/jingle/s5b.c	b66b05820f5cb41048f7b1dd924f25903eb5eda0
@@ -1078,6 +1078,10 @@ jingle_s5b_connect_cb(gpointer data, gin
 	JingleS5B *s5b = cd->s5b;
 	JingleSession *session = cd->session;
 	JabberIq *result = NULL;
+    
+	/* reset connect data (prevents the timeout callback to try and cancel the
+	the connect if the connection was unsuccessful */
+	s5b->priv->connect_data = NULL;
 	
 	/* cancel timeout if set */
 	if (s5b->priv->connect_timeout) {
@@ -1092,7 +1096,7 @@ jingle_s5b_connect_cb(gpointer data, gin
 	
 	if (source < 0) {
 		/* failed to connect */
-		/* trigger the a "timeout" to get to the next streamhost */
+		/* trigger the a "timeout" to get to the next streamhost */	
 		jingle_s5b_connect_timeout_cb(data);
 		return;
 	}