cpw.malu.xmpp.jingle_ft: d4f2b2da: Fixup from propagate

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: d4f2b2da28ddcaf8668216357d72b26edb4830db
Ancestor: 8db831141d9f9bcdc9ef70c436bef737965e9254
Author: malu at pidgin.im
Date: 2009-04-06T18:43:24
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/d4f2b2da28ddcaf8668216357d72b26edb4830db

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

ChangeLog: 

Fixup from propagate
Set the resulting fds when connecting (as initiator and receiver) in s5b

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jingle/s5b.c	c13374c3f78166c7a3927212e5f7a3aba255e19e
+++ libpurple/protocols/jabber/jingle/s5b.c	6fe896a145616f754ab806402ccc0625046c2fe8
@@ -408,6 +408,8 @@ jingle_s5b_send_read_again_resp_cb(gpoin
 	 */
 	purple_debug_info("jingle-s5b", "SOCKS5 connection negotiation completed. "
 					  "Waiting for IQ result to start file transfer.\n");
+	/* set the local fd as connected */
+	s5b->priv->local_fd = source;
 	
 	g_free(data);
 }
============================================================
--- libpurple/protocols/jabber/si.c	8623a4b6be1e220c4d6158b89edec616bd2e1426
+++ libpurple/protocols/jabber/si.c	c3fcb288a6a08e0335cd77a0e69c429080045677
@@ -1580,13 +1580,14 @@ void jabber_si_parse(JabberStream *js, c
 {
 	JabberSIXfer *jsx;
 	PurpleXfer *xfer;
+	/*
 	xmlnode *file, *feature, *x, *field, *option, *value;
 	const char *stream_id, *filename, *filesize_c, *profile;
 	xmlnode *si, *file, *feature, *x, *field, *option, *value;
 	const char *stream_id, *filename, *filesize_c, *profile, *from;
-	xmlnode *si, *file, *feature, *x, *field, *option, *value;
-	const char *stream_id, *profile, *from;
-	size_t filesize = 0;
+	 */
+	xmlnode *file, *feature, *x, *field, *option, *value;
+	const char *stream_id, *profile;
 
 	if(!(profile = xmlnode_get_attrib(si, "profile")) ||
 			strcmp(profile, "http://jabber.org/protocol/si/profile/file-transfer"))
@@ -1651,18 +1652,15 @@ void jabber_si_parse(JabberStream *js, c
 	g_return_if_fail(xfer != NULL);
 
 	xfer = jabber_xfer_create_from_xml(js->gc->account, file, from, jsx);
-	if (xfer)
-	{
+	if (xfer) {
 		purple_xfer_set_init_fnc(xfer, jabber_si_xfer_init);
 		purple_xfer_set_request_denied_fnc(xfer, jabber_si_xfer_request_denied);
 		purple_xfer_set_cancel_recv_fnc(xfer, jabber_si_xfer_cancel_recv);
 		purple_xfer_set_end_fnc(xfer, jabber_si_xfer_end);
 
-	js->file_transfers = g_list_append(js->file_transfers, xfer);
+		js->file_transfers = g_list_append(js->file_transfers, xfer);
 
 		purple_xfer_request(xfer);
-	} else {
-		jabber_si_xfer_free(jsx);
 	}
 }