Mercurial > pidgin.yaz
diff src/protocols/oscar/oscar.c @ 9771:9812dde4323e
[gaim-migrate @ 10639]
Some good file transfer tweaks from Dave West
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Wed, 18 Aug 2004 04:13:35 +0000 |
| parents | 41f302d41839 |
| children | 62eb9fe24692 |
line wrap: on
line diff
--- a/src/protocols/oscar/oscar.c Tue Aug 17 02:52:13 2004 +0000 +++ b/src/protocols/oscar/oscar.c Wed Aug 18 04:13:35 2004 +0000 @@ -1808,7 +1808,8 @@ gaim_debug_info("oscar", "AAA - in oscar_xfer_cancel_recv\n"); - aim_im_sendch2_sendfile_cancel(oft_info->sess, oft_info); + if (gaim_xfer_get_status(xfer) != GAIM_XFER_STATUS_CANCEL_REMOTE) + aim_im_sendch2_sendfile_cancel(oft_info->sess, oft_info); aim_conn_kill(oft_info->sess, &oft_info->conn); aim_oft_destroyinfo(oft_info); @@ -1877,7 +1878,8 @@ gaim_debug_info("oscar", "AAA - in oscar_xfer_cancel_send\n"); - aim_im_sendch2_sendfile_cancel(oft_info->sess, oft_info); + if (gaim_xfer_get_status(xfer) != GAIM_XFER_STATUS_CANCEL_REMOTE) + aim_im_sendch2_sendfile_cancel(oft_info->sess, oft_info); aim_conn_kill(oft_info->sess, &oft_info->conn); aim_oft_destroyinfo(oft_info);