# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1089578788 0
# Node ID 3c79229259ba2a0ac3835810ff123833267154df
# Parent  3ed6001d5de805752025adbd9d7ff02681989165
[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>

diff -r 3ed6001d5de8 -r 3c79229259ba src/ft.c
--- 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);