cpw.malu.xmpp.jingle_ft: 9ac282bf: Make it compile again :)

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 9ac282bf2bcf7d0040f7ebafa8744db3b832e8cf
Ancestor: 2a0d84651f0c307f4af2b731b14341290ea20674
Author: malu at pidgin.im
Date: 2010-01-15T21:43:10
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/9ac282bf2bcf7d0040f7ebafa8744db3b832e8cf

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

ChangeLog: 

Make it compile again :)
Remove a (very verbose) debug output
Cancel listner and connecting, if still around when destroying the s5b transport

-------------- next part --------------
============================================================
--- libpurple/ft.c	a9a486518644ce643039db36571bb423534153e6
+++ libpurple/ft.c	3c02e1899ac38b28c0806c13016019204690ca37
@@ -1168,8 +1168,6 @@ transfer_cb(gpointer data, gint source, 
 transfer_cb(gpointer data, gint source, PurpleInputCondition condition)
 {
 	PurpleXfer *xfer = data;
-
-	purple_debug_info("filetransfer", "transfer_cb: xfer: %p\n", xfer);
 	
 	if (xfer->dest_fp == NULL) {
 		/* The UI is moderating its side manually */
============================================================
--- libpurple/protocols/jabber/jingle/s5b.c	9f5a833cf101b487b21354c65c79dd79fed204d3
+++ libpurple/protocols/jabber/jingle/s5b.c	c55cc9b83f2d81998fad2049fdd48b75560df9e0
@@ -317,6 +317,12 @@ jingle_s5b_finalize (GObject *s5b)
 	if (priv->sid)
 		g_free(priv->sid);
 
+	if (priv->connect_data)
+		purple_proxy_connect_cancel(priv->connect_data);
+
+	if (priv->listen_data)
+		purple_network_listen_cancel(priv->listen_data);
+	
 	/* remove port mapping */
 	if (priv->fd >= 0) {
 		if (priv->accepted_candidate &&
@@ -1263,7 +1269,7 @@ jingle_s5b_connect_to_candidate(JingleS5
 	hash = jabber_calculate_data_sha1sum(dstaddr, strlen(dstaddr));
 	purple_debug_info("jingle-s5b", "connecting with hash: %s\n", hash);
 
-	s5b->priv->connect_data = 
+	s5b->priv->connect_data =
 		purple_proxy_connect_socks5(NULL, s5b->priv->ppi, hash, 0, 
 			connect_cb, data);
 	g_free(hash);
@@ -1309,6 +1315,7 @@ jingle_s5b_proxy_timeout_cb(gpointer dat
 static gboolean
 jingle_s5b_proxy_timeout_cb(gpointer data)
 {
+	JingleS5B *s5b = ((JingleS5BConnectData *) data)->s5b;
 	purple_debug_info("jingle-s5b", "timeout when connecting to proxy\n");
 
 	/* cancel connect */