changeset
[gaim-migrate @ 10339]
Sun, 11 Jul 2004 20:46:28 +0000
- author
- Mark Doliner <markdoliner@pidgin.im>
- date
- Sun, 11 Jul 2004 20:46:28 +0000
- changeset 9512
- d51da219ffb4
- parent 9511
- d68f99136f26
- child 9513
- ec57f8faed31
[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
| src/ft.c | file | annotate | diff | comparison | revisions |
--- 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);
