Mercurial > pidgin.yaz
changeset 15278:623affd9a13e
[gaim-migrate @ 18067]
Patch from Graham Booker which fixes a crash after a successful OSCAR file transfer. gaim_xfer_end() is called by ft.c's transfer_cb() when the transfer completes so does not need to be called here; peer_connection_schedule_destroy() should be called instead.
committer: Tailor Script <tailor@pidgin.im>
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Wed, 03 Jan 2007 14:02:44 +0000 |
| parents | 84b215400b6b |
| children | 00fbd797dc29 |
| files | libgaim/protocols/oscar/oft.c |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libgaim/protocols/oscar/oft.c Wed Jan 03 02:07:05 2007 +0000 +++ b/libgaim/protocols/oscar/oft.c Wed Jan 03 14:02:44 2007 +0000 @@ -382,7 +382,8 @@ conn->watcher_incoming = 0; conn->xfer->fd = conn->fd; conn->fd = -1; - gaim_xfer_end(conn->xfer); + conn->disconnect_reason = OSCAR_DISCONNECT_DONE; + peer_connection_schedule_destroy(conn, conn->disconnect_reason, NULL); } /**