cpw.malu.xmpp.jingle_ft: e5dfc4ab: Actually set the transfer as completed w...
malu at pidgin.im
malu at pidgin.im
Mon Jan 18 15:23:19 EST 2010
-----------------------------------------------------------------
Revision: e5dfc4ab93e66f7f57be4cf40f17ec77246af3be
Ancestor: 4c8513fa1dfcd5dae171fd9028ce5bffe1076c75
Author: malu at pidgin.im
Date: 2010-01-18T20:19:06
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/e5dfc4ab93e66f7f57be4cf40f17ec77246af3be
Modified files:
libpurple/protocols/jabber/jingle/file-transfer.c
libpurple/protocols/jabber/jingle/s5b.c
ChangeLog:
Actually set the transfer as completed when the last packet has been confirmed for IBB
Added some additional debug output...
-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jingle/file-transfer.c 47b3e289161aeb1e0c65b2a743398b58fb4cd703
+++ libpurple/protocols/jabber/jingle/file-transfer.c 96b6f656ccbf973344f55e5845a1147933dc875d
@@ -217,6 +217,7 @@ jingle_file_transfer_ibb_data_sent_callb
if (remaining == 0) {
/* close the session */
+ purple_xfer_set_completed(xfer, TRUE);
purple_xfer_end(xfer);
} else {
/* send more... */
============================================================
--- libpurple/protocols/jabber/jingle/s5b.c de130932997a16705c3a1124d5da13fc17d5788e
+++ libpurple/protocols/jabber/jingle/s5b.c de384f3aa315c322f88d5eab0da1a1b13d0b7b6b
@@ -329,6 +329,7 @@ jingle_s5b_finalize (GObject *s5b)
priv->accepted_candidate->type == JINGLE_S5B_CANDIDATE_TYPE_ASSISTED) {
purple_network_remove_port_mapping(priv->fd);
}
+ purple_debug_info("jingle-s5b", "closing fd %d\n", priv->fd);
close(priv->fd);
} else if (priv->local_fd >= 0) {
purple_network_remove_port_mapping(priv->local_fd);
@@ -1205,12 +1206,12 @@ jingle_s5b_connect_cb(gpointer data, gin
return;
}
- purple_debug_info("jingle-s5b", "Successful in connecting!\n");
+ purple_debug_info("jingle-s5b", "Successful in connecting! source = %d\n",
+ source);
s5b->priv->remote_fd = source;
s5b->priv->is_connected_to_remote = TRUE;
-
/* set the currently tried streamhost as the successfull one */
s5b->priv->successful_remote_candidate =
(JingleS5BCandidate *) s5b->priv->remaining_candidates->data;
More information about the Commits
mailing list