comparison src/ft.c @ 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 <[e-mail]>

9511:3ed6001d5de8

{
	GaimXferUiOps *ui_ops;

	g_return_if_fail(xfer != NULL);

	if (gaim_xfer_get_status(xfer) == GAIM_XFER_STATUS_STARTED)
		gaim_xfer_cancel_local(xfer);

	ui_ops = gaim_xfer_get_ui_ops(xfer);

		buf = g_strdup_printf(_("%s wants to send you %s (%s)"),
				      xfer->who, gaim_xfer_get_filename(xfer),
				      size_buf);
		g_free(size_buf);

		gaim_request_accept_cancel(NULL, NULL, buf, NULL, 0, xfer,
					   G_CALLBACK(gaim_xfer_choose_file),
					   G_CALLBACK(cancel_recv_cb));
		g_free(buf);
	} else
		gaim_xfer_choose_file(xfer);

	    gaim_xfer_get_remote_port(xfer))
		buf2 = g_strdup_printf(_("A file is available for download from:\n"
					 "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,
				   G_CALLBACK(ask_accept_ok),
				   G_CALLBACK(ask_accept_cancel));
	g_free(buf);
	g_free(buf2);
}

9512:3c79229259ba

{
	GaimXferUiOps *ui_ops;

	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);

	ui_ops = gaim_xfer_get_ui_ops(xfer);

		buf = g_strdup_printf(_("%s wants to send you %s (%s)"),
				      xfer->who, gaim_xfer_get_filename(xfer),
				      size_buf);
		g_free(size_buf);

		gaim_request_accept_cancel(xfer, NULL, buf, NULL, 0, xfer,
					   G_CALLBACK(gaim_xfer_choose_file),
					   G_CALLBACK(cancel_recv_cb));
		g_free(buf);
	} else
		gaim_xfer_choose_file(xfer);

	    gaim_xfer_get_remote_port(xfer))
		buf2 = g_strdup_printf(_("A file is available for download from:\n"
					 "Remote host: %s\nRemote port: %d"),
				       gaim_xfer_get_remote_ip(xfer),
				       gaim_xfer_get_remote_port(xfer));
	gaim_request_accept_cancel(xfer, NULL, buf, buf2, 0, xfer,
				   G_CALLBACK(ask_accept_ok),
				   G_CALLBACK(ask_accept_cancel));
	g_free(buf);
	g_free(buf2);
}