Mercurial > pidgin
comparison libpurple/protocols/jabber/si.c @ 27590:a08e84032814
merge of '2348ff22f0ff3453774b8b25b36238465580c609'
and 'e76f11543c2a4aa05bdf584f087cbe3439029661'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sun, 12 Jul 2009 05:43:38 +0000 |
parents | 73c8e1964eef |
children | 636c3b6c9cc7 8781cfb550bb |
comparison
equal
deleted
inserted
replaced
27104:048bcf41deef | 27590:a08e84032814 |
---|---|
974 PurpleXfer *xfer = (PurpleXfer *) jabber_ibb_session_get_user_data(sess); | 974 PurpleXfer *xfer = (PurpleXfer *) jabber_ibb_session_get_user_data(sess); |
975 JabberStream *js = jabber_ibb_session_get_js(sess); | 975 JabberStream *js = jabber_ibb_session_get_js(sess); |
976 PurpleConnection *gc = js->gc; | 976 PurpleConnection *gc = js->gc; |
977 PurpleAccount *account = purple_connection_get_account(gc); | 977 PurpleAccount *account = purple_connection_get_account(gc); |
978 | 978 |
979 purple_debug_error("jabber", "an error occured during IBB file transfer\n"); | 979 purple_debug_error("jabber", "an error occurred during IBB file transfer\n"); |
980 purple_xfer_error(purple_xfer_get_type(xfer), account, | 980 purple_xfer_error(purple_xfer_get_type(xfer), account, |
981 jabber_ibb_session_get_who(sess), | 981 jabber_ibb_session_get_who(sess), |
982 _("An error occured on the in-band bytestream transfer\n")); | 982 _("An error occurred on the in-band bytestream transfer\n")); |
983 purple_xfer_cancel_remote(xfer); | 983 purple_xfer_cancel_remote(xfer); |
984 } | 984 } |
985 | 985 |
986 static void | 986 static void |
987 jabber_si_xfer_ibb_closed_cb(JabberIBBSession *sess) | 987 jabber_si_xfer_ibb_closed_cb(JabberIBBSession *sess) |
1319 purple_network_listen_cancel(jsx->listen_data); | 1319 purple_network_listen_cancel(jsx->listen_data); |
1320 if (jsx->iq_id != NULL) | 1320 if (jsx->iq_id != NULL) |
1321 jabber_iq_remove_callback_by_id(js, jsx->iq_id); | 1321 jabber_iq_remove_callback_by_id(js, jsx->iq_id); |
1322 if (jsx->local_streamhost_fd >= 0) | 1322 if (jsx->local_streamhost_fd >= 0) |
1323 close(jsx->local_streamhost_fd); | 1323 close(jsx->local_streamhost_fd); |
1324 if (purple_xfer_get_type(xfer) == PURPLE_XFER_SEND && | |
1325 xfer->fd >= 0) { | |
1326 purple_debug_info("jabber", "remove port mapping\n"); | |
1327 purple_network_remove_port_mapping(xfer->fd); | |
1328 } | |
1324 if (jsx->connect_timeout > 0) | 1329 if (jsx->connect_timeout > 0) |
1325 purple_timeout_remove(jsx->connect_timeout); | 1330 purple_timeout_remove(jsx->connect_timeout); |
1326 if (jsx->ibb_timeout_handle > 0) | 1331 if (jsx->ibb_timeout_handle > 0) |
1327 purple_timeout_remove(jsx->ibb_timeout_handle); | 1332 purple_timeout_remove(jsx->ibb_timeout_handle); |
1328 | 1333 |