cpw.malu.xmpp.jingle_ft: 6995a761: Bad things happen if you call jingle_con...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 6995a76122f1c6b9acd4516f0f79c68764416de0
Ancestor: 597003cd6fe9e16b9f8817746cb395eb857b96af
Author: malu at pidgin.im
Date: 2009-05-17T18:56:12
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/6995a76122f1c6b9acd4516f0f79c68764416de0

Modified files:
        libpurple/protocols/jabber/jingle/file-transfer.c

ChangeLog: 

Bad things happen if you call jingle_content_accept_transport twice, ie.
NULLifies the transport

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jingle/file-transfer.c	2eaa9537e0292d62fb07245586eb1613c493ca8c
+++ libpurple/protocols/jabber/jingle/file-transfer.c	f8c831b92a605494391284870180602428c32389
@@ -844,7 +844,8 @@ jingle_file_transfer_handle_action_inter
 			/* if we got a streamhost-error before, we should switch over to
 			 IBB here */
 			if (JINGLE_FT(content)->priv->remote_failed_s5b) {
-				jingle_content_accept_transport(content);
+				/* Note: the new tranport are automatically accepted from
+				 pending before this is called */
 				/* open the file, etc... */
 				JINGLE_FT_GET_PRIVATE(JINGLE_FT(content))->ibb_fp = 
 					g_fopen(purple_xfer_get_local_filename(xfer), "rb");