cpw.malu.xmpp.jingle_ft: e49f3d86: Create the IBB session in the right tran...
malu at pidgin.im
malu at pidgin.im
Fri Mar 20 20:15:34 EDT 2009
-----------------------------------------------------------------
Revision: e49f3d8648da07481dd770c16d9efb77fcb0882e
Ancestor: 8e5c57ab03ceec70744398a05c47c77e8a668ad0
Author: malu at pidgin.im
Date: 2009-03-21T00:13:30
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/e49f3d8648da07481dd770c16d9efb77fcb0882e
Modified files:
libpurple/protocols/jabber/jingle/file-transfer.c
ChangeLog:
Create the IBB session in the right transport when acting as receiver.
Fixes crashing when cancel receive.
-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jingle/file-transfer.c d328f6e292efff393ad33dcb98d4f2d738bf1910
+++ libpurple/protocols/jabber/jingle/file-transfer.c 3a5357b54e9869852e79e639e3f223be1df4dd19
@@ -480,8 +480,7 @@ jingle_file_transfer_handle_action_inter
}
case JINGLE_SESSION_INITIATE: {
JingleSession *session = jingle_content_get_session(content);
- JingleTransport *transport = jingle_transport_parse(
- xmlnode_get_child(xmlcontent, "transport"));
+ JingleTransport *transport = jingle_content_get_transport(content);
xmlnode *description = xmlnode_get_child(xmlcontent, "description");
JabberStream *js = jingle_session_get_js(session);
xmlnode *offer = xmlnode_get_child(description, "offer");
@@ -524,6 +523,8 @@ jingle_file_transfer_handle_action_inter
purple_xfer_get_local_filename(xfer);
jingle_ibb_create_session(ibb, content, sid, who);
}
+
+ g_object_unref(transport);
}
g_object_unref(session);
More information about the Commits
mailing list