cpw.malu.xmpp.jingle_ft: 2a0d8465: Cancel connect when encoutering a connec...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 2a0d84651f0c307f4af2b731b14341290ea20674
Ancestor: 768ae34d8749980d7c74ee729fb47c3e5f394e6a
Author: malu at pidgin.im
Date: 2010-01-15T20:54:17
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/2a0d84651f0c307f4af2b731b14341290ea20674

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

ChangeLog: 

Cancel connect when encoutering a connect timeout for a proxy

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jingle/s5b.c	d7ed373b83c53d11de99c0630436ebafba4417c0
+++ libpurple/protocols/jabber/jingle/s5b.c	9f5a833cf101b487b21354c65c79dd79fed204d3
@@ -1310,6 +1310,12 @@ jingle_s5b_proxy_timeout_cb(gpointer dat
 jingle_s5b_proxy_timeout_cb(gpointer data)
 {
 	purple_debug_info("jingle-s5b", "timeout when connecting to proxy\n");
+
+	/* cancel connect */
+	if (s5b->priv->connect_data)
+		purple_proxy_connect_cancel(s5b->priv->connect_data);
+	s5b->priv->connect_data = NULL;
+
 	jingle_s5b_send_proxy_error(data);
 
 	return FALSE;