Mercurial > pidgin.yaz
changeset 9512:3c79229259ba
[gaim-migrate @ 10339]
Oh, one more change. If a PRPL cancels an ft while the Gaim user is
still selecting a file, then close the file browser
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 11 Jul 2004 20:46:28 +0000 |
| parents | 3ed6001d5de8 |
| children | ac94e3f5ac8a |
| files | src/ft.c |
| diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ft.c Sun Jul 11 20:42:16 2004 +0000 +++ b/src/ft.c Sun Jul 11 20:46:28 2004 +0000 @@ -66,6 +66,9 @@ g_return_if_fail(xfer != NULL); + /* Close the file browser, if it's open */ + gaim_request_close_with_handle(xfer); + if (gaim_xfer_get_status(xfer) == GAIM_XFER_STATUS_STARTED) gaim_xfer_cancel_local(xfer); @@ -193,7 +196,7 @@ size_buf); g_free(size_buf); - gaim_request_accept_cancel(NULL, NULL, buf, NULL, 0, xfer, + gaim_request_accept_cancel(xfer, NULL, buf, NULL, 0, xfer, G_CALLBACK(gaim_xfer_choose_file), G_CALLBACK(cancel_recv_cb)); g_free(buf); @@ -232,7 +235,7 @@ "Remote host: %s\nRemote port: %d"), gaim_xfer_get_remote_ip(xfer), gaim_xfer_get_remote_port(xfer)); - gaim_request_accept_cancel(NULL, NULL, buf, buf2, 0, xfer, + gaim_request_accept_cancel(xfer, NULL, buf, buf2, 0, xfer, G_CALLBACK(ask_accept_ok), G_CALLBACK(ask_accept_cancel)); g_free(buf);