cpw.malu.xmpp.jingle_ft: d45734a9: Removed an unnessesary cancel timeout

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: d45734a9b6aeef67f8a8e8187c2bcee62cb483b1
Ancestor: 2764e070221409c46deabb980b52689fca1b2771
Author: malu at pidgin.im
Date: 2009-04-28T22:06:54
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/d45734a9b6aeef67f8a8e8187c2bcee62cb483b1

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

ChangeLog: 

Removed an unnessesary cancel timeout
Added if-checking for some cancel/destroy stuff

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jingle/s5b.c	b1992486fe19237f8aa52ae9be3d15df5ad1c58f
+++ libpurple/protocols/jabber/jingle/s5b.c	09b0ab91e345d394f5c8f6c8f99f6311b633b24b
@@ -983,11 +983,10 @@ jingle_s5b_connect_timeout_cb(gpointer d
 	purple_debug_info("jingle-s5b", "in jingle_s5b_connect_timeout_cb\n");
 
 	/* cancel connect */
-	purple_proxy_connect_cancel(s5b->priv->connect_data);
+	if (s5b->priv->connect_data)
+		purple_proxy_connect_cancel(s5b->priv->connect_data);
 	s5b->priv->connect_data = NULL;
 
-	/* cancel timeout */
-	purple_timeout_remove(s5b->priv->connect_timeout);
 	s5b->priv->connect_timeout = 0;
 	
 	/* advance streamhost "counter" */
@@ -1018,6 +1017,11 @@ jingle_s5b_connect_cb(gpointer data, gin
 		s5b->priv->connect_timeout = 0;
 	}
 
+	if (s5b->priv->ppi) {
+		purple_proxy_info_destroy(s5b->priv->ppi);
+		s5b->priv->ppi = NULL;
+	}
+	
 	if (source < 0) {
 		/* failed to connect */
 		/* trigger the a "timeout" to get to the next streamhost */