cpw.malu.xmpp.jingle_ft: 91e1a7ed: When receiveing a session-terminate show...
malu at pidgin.im
malu at pidgin.im
Mon Jan 25 16:40:31 EST 2010
-----------------------------------------------------------------
Revision: 91e1a7ed6c7acf8625f6b6e6cef97ccc57355255
Ancestor: 40b2ce795975afe08b0a60f7818e75fa53b8add0
Author: malu at pidgin.im
Date: 2010-01-25T21:39:29
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/91e1a7ed6c7acf8625f6b6e6cef97ccc57355255
Modified files:
libpurple/protocols/jabber/jingle/file-transfer.c
ChangeLog:
When receiveing a session-terminate show correctly who terminated the session.
-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jingle/file-transfer.c e0b1e3b9a94979a01a59c14c9aa348b754fe1d46
+++ libpurple/protocols/jabber/jingle/file-transfer.c 14e7ca5bc5a838a0a1606348ecfb7f0157cc722b
@@ -786,7 +786,7 @@ jingle_file_transfer_handle_action_inter
"got session-terminate, ending transfer %p with content %p\n",
xfer, xfer->data);
if (!purple_xfer_is_canceled(xfer))
- purple_xfer_end(xfer);
+ purple_xfer_cancel_remote(xfer);
JINGLE_FT_GET_PRIVATE(JINGLE_FT(content))->xfer = NULL;
xfer->data = NULL;
}
More information about the Commits
mailing list