comparison src/ft.c @ 10654:f2e86683cafc

[gaim-migrate @ 12182] sf patch #1152664, from Richard Laager This patches does three things: First, it uses aliases in file transfer messages whenever possible. Second, it fixes the case where file transfer completion messages are not showing for MSN. Third, it makes the wording more consistent: Canceled is used to describe cases when the file transfer was actively canceled by either party. Failed is used otherwise. Aborted is no longer used at all. Previously, aborted was used in some places while failed was used under the same circumstances in other places. Also, in the file transfer box, canceled was used in one place for remotely or locally canceled files while in another place in the same box canceled was only used for locally canceled files (failed was used for remotely canceled files). committer: Tailor Script <[e-mail]>

10653:20cbadb004a0

static void gaim_xfer_show_file_error(GaimXfer *xfer, const char *filename)
{
	gchar *msg = NULL;
	GaimXferType xfer_type = gaim_xfer_get_type(xfer);

	switch(xfer_type) {
		case GAIM_XFER_SEND:
			msg = g_strdup_printf(_("Error reading %s: \n%s.\n"),
								  filename, strerror(errno));

								  filename, strerror(errno));
			break;
		}

	gaim_xfer_conversation_write(xfer, msg, TRUE);
	gaim_xfer_error(xfer_type, xfer->who, msg);
	g_free(msg);
}

static void
gaim_xfer_choose_file_ok_cb(void *user_data, const char *filename)

	size_t size;

	/* If we have already accepted the request, ask the destination file
	   name directly */
	if (gaim_xfer_get_status(xfer) != GAIM_XFER_STATUS_ACCEPTED) {
		if (gaim_xfer_get_filename(xfer) != NULL)
		{
			size = gaim_xfer_get_size(xfer);
			size_buf = gaim_str_size_to_units(size);
			escaped = g_markup_escape_text(gaim_xfer_get_filename(xfer), -1);
			buf = g_strdup_printf(_("%s wants to send you %s (%s)"),
					      xfer->who, escaped,
					      size_buf);
			g_free(size_buf);
			g_free(escaped);
		}
		else
		{
			buf = g_strdup_printf(_("%s wants to send you a file"), xfer->who);
		}

		if (xfer->message != NULL)
			serv_got_im(gaim_account_get_connection(xfer->account),
								 xfer->who, xfer->message, 0, time(NULL));

static void
gaim_xfer_ask_accept(GaimXfer *xfer)
{
	char *buf, *buf2 = NULL;

	buf = g_strdup_printf(_("Accept file transfer request from %s?"),
			      xfer->who);
	if (gaim_xfer_get_remote_ip(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),

void
gaim_xfer_request_accepted(GaimXfer *xfer, const char *filename)
{
	GaimXferType type;
	struct stat st;

	if (xfer == NULL)
		return;

	type = gaim_xfer_get_type(xfer);

	if (!filename && type == GAIM_XFER_RECEIVE) {
		xfer->status = GAIM_XFER_STATUS_ACCEPTED;
		xfer->ops.init(xfer);
		return;
	}

	if (type == GAIM_XFER_SEND) {
		char *msg;

		/* Check the filename. */
		if (g_strrstr(filename, "..")) {

			msg = g_strdup_printf(_("%s is not a valid filename.\n"), filename);
			gaim_xfer_error(type, xfer->who, msg);
			g_free(msg);

			gaim_xfer_unref(xfer);
			return;
		}

		gaim_xfer_set_local_filename(xfer, filename);
		gaim_xfer_set_filename(xfer, g_basename(filename));
		gaim_xfer_set_size(xfer, st.st_size);

		msg = g_strdup_printf(_("Offering to send %s to %s"),
							  filename, xfer->who);
		gaim_xfer_conversation_write(xfer, msg, FALSE);
		g_free(msg);
	}
	else {
		xfer->status = GAIM_XFER_STATUS_ACCEPTED;
		gaim_xfer_set_local_filename(xfer, filename);
	}

	gaim_xfer_add(xfer);
	xfer->ops.init(xfer);

{
	GaimXferUiOps *ui_ops;

	g_return_if_fail(xfer != NULL);

	if (completed == TRUE)
		gaim_xfer_set_status(xfer, GAIM_XFER_STATUS_DONE);

	ui_ops = gaim_xfer_get_ui_ops(xfer);

	if (ui_ops != NULL && ui_ops->update_progress != NULL)
		ui_ops->update_progress(xfer, gaim_xfer_get_progress(xfer));

}

void
gaim_xfer_end(GaimXfer *xfer)
{
	char *msg = NULL;

	g_return_if_fail(xfer != NULL);

	/* See if we are actually trying to cancel this. */
	if (gaim_xfer_get_status(xfer) != GAIM_XFER_STATUS_DONE) {
		gaim_xfer_cancel_local(xfer);
		return;
	}

	if (gaim_xfer_get_filename(xfer) != NULL)
		msg = g_strdup_printf(_("Transfer of file %s complete"),
							  gaim_xfer_get_filename(xfer));
	else
		msg = g_strdup_printf(_("File transfer complete"));
	gaim_xfer_conversation_write(xfer, msg, FALSE);
	g_free(msg);

	if (xfer->ops.end != NULL)
		xfer->ops.end(xfer);

	if (xfer->watcher != 0) {

void
gaim_xfer_cancel_remote(GaimXfer *xfer)
{
	GaimXferUiOps *ui_ops;
	gchar *msg, *escaped;

	g_return_if_fail(xfer != NULL);

	gaim_request_close_with_handle(xfer);
	gaim_xfer_set_status(xfer, GAIM_XFER_STATUS_CANCEL_REMOTE);

	if (gaim_xfer_get_filename(xfer) != NULL)
	{
		escaped = g_markup_escape_text(gaim_xfer_get_filename(xfer), -1);
		msg = g_strdup_printf(_("%s canceled the transfer of %s"),
							  xfer->who, escaped);
		g_free(escaped);
	}
	else
	{
		msg = g_strdup_printf(_("%s canceled the file transfer"), xfer->who);
	}
	gaim_xfer_conversation_write(xfer, msg, TRUE);
	gaim_xfer_error(gaim_xfer_get_type(xfer), xfer->who, msg);
	g_free(msg);

	if (gaim_xfer_get_type(xfer) == GAIM_XFER_SEND)
	{
		if (xfer->ops.cancel_send != NULL)

	gaim_xfer_unref(xfer);
}

void
gaim_xfer_error(GaimXferType type, const char *who, const char *msg)
{
	char *title;

	g_return_if_fail(msg  != NULL);
	g_return_if_fail(type != GAIM_XFER_UNKNOWN);

	if (type == GAIM_XFER_SEND)
		title = g_strdup_printf(_("File transfer to %s aborted.\n"), who);
	else
		title = g_strdup_printf(_("File transfer from %s aborted.\n"), who);

	gaim_notify_error(NULL, NULL, title, msg);

	g_free(title);
}

10654:f2e86683cafc

static void gaim_xfer_show_file_error(GaimXfer *xfer, const char *filename)
{
	gchar *msg = NULL;
	GaimXferType xfer_type = gaim_xfer_get_type(xfer);
	GaimAccount *account = gaim_xfer_get_account(xfer);

	switch(xfer_type) {
		case GAIM_XFER_SEND:
			msg = g_strdup_printf(_("Error reading %s: \n%s.\n"),
								  filename, strerror(errno));

								  filename, strerror(errno));
			break;
		}

	gaim_xfer_conversation_write(xfer, msg, TRUE);
	gaim_xfer_error(xfer_type, account, xfer->who, msg);
	g_free(msg);
}

static void
gaim_xfer_choose_file_ok_cb(void *user_data, const char *filename)

	size_t size;

	/* If we have already accepted the request, ask the destination file
	   name directly */
	if (gaim_xfer_get_status(xfer) != GAIM_XFER_STATUS_ACCEPTED) {
		GaimBuddy *buddy = gaim_find_buddy(xfer->account, xfer->who);

		if (gaim_xfer_get_filename(xfer) != NULL)
		{
			size = gaim_xfer_get_size(xfer);
			size_buf = gaim_str_size_to_units(size);
			escaped = g_markup_escape_text(gaim_xfer_get_filename(xfer), -1);
			buf = g_strdup_printf(_("%s wants to send you %s (%s)"),
					      buddy ? gaim_buddy_get_alias(buddy) : xfer->who,
					      escaped, size_buf);
			g_free(size_buf);
			g_free(escaped);
		}
		else
		{
			buf = g_strdup_printf(_("%s wants to send you a file"),
						buddy ? gaim_buddy_get_alias(buddy) : xfer->who);
		}

		if (xfer->message != NULL)
			serv_got_im(gaim_account_get_connection(xfer->account),
								 xfer->who, xfer->message, 0, time(NULL));

static void
gaim_xfer_ask_accept(GaimXfer *xfer)
{
	char *buf, *buf2 = NULL;
	GaimBuddy *buddy = gaim_find_buddy(xfer->account, xfer->who);

	buf = g_strdup_printf(_("Accept file transfer request from %s?"),
			      buddy ? gaim_buddy_get_alias(buddy) : xfer->who);
	if (gaim_xfer_get_remote_ip(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),

void
gaim_xfer_request_accepted(GaimXfer *xfer, const char *filename)
{
	GaimXferType type;
	struct stat st;
	char *msg;
	GaimAccount *account;
	GaimBuddy *buddy;

	if (xfer == NULL)
		return;

	type = gaim_xfer_get_type(xfer);
	account = gaim_xfer_get_account(xfer);

	if (!filename && type == GAIM_XFER_RECEIVE) {
		xfer->status = GAIM_XFER_STATUS_ACCEPTED;
		xfer->ops.init(xfer);
		return;
	}

	buddy = gaim_find_buddy(account, xfer->who);

	if (type == GAIM_XFER_SEND) {
		/* Check the filename. */
		if (g_strrstr(filename, "..")) {

			msg = g_strdup_printf(_("%s is not a valid filename.\n"), filename);
			gaim_xfer_error(type, account, xfer->who, msg);
			g_free(msg);

			gaim_xfer_unref(xfer);
			return;
		}

		gaim_xfer_set_local_filename(xfer, filename);
		gaim_xfer_set_filename(xfer, g_basename(filename));
		gaim_xfer_set_size(xfer, st.st_size);

		msg = g_strdup_printf(_("Offering to send %s to %s"),
				filename, buddy ? gaim_buddy_get_alias(buddy) : xfer->who);
		gaim_xfer_conversation_write(xfer, msg, FALSE);
		g_free(msg);
	}
	else {
		xfer->status = GAIM_XFER_STATUS_ACCEPTED;
		gaim_xfer_set_local_filename(xfer, filename);

		msg = g_strdup_printf(_("Starting transfer of %s from %s"),
				xfer->filename, buddy ? gaim_buddy_get_alias(buddy) : xfer->who);
		gaim_xfer_conversation_write(xfer, msg, FALSE);
		g_free(msg);
	}

	gaim_xfer_add(xfer);
	xfer->ops.init(xfer);

{
	GaimXferUiOps *ui_ops;

	g_return_if_fail(xfer != NULL);

	if (completed == TRUE) {
		char *msg = NULL;
		gaim_xfer_set_status(xfer, GAIM_XFER_STATUS_DONE);

		if (gaim_xfer_get_filename(xfer) != NULL)
			msg = g_strdup_printf(_("Transfer of file %s complete"),
								gaim_xfer_get_filename(xfer));
		else
			msg = g_strdup_printf(_("File transfer complete"));
		gaim_xfer_conversation_write(xfer, msg, FALSE);
		g_free(msg);
	}

	ui_ops = gaim_xfer_get_ui_ops(xfer);

	if (ui_ops != NULL && ui_ops->update_progress != NULL)
		ui_ops->update_progress(xfer, gaim_xfer_get_progress(xfer));

}

void
gaim_xfer_end(GaimXfer *xfer)
{
	g_return_if_fail(xfer != NULL);

	/* See if we are actually trying to cancel this. */
	if (gaim_xfer_get_status(xfer) != GAIM_XFER_STATUS_DONE) {
		gaim_xfer_cancel_local(xfer);
		return;
	}

	if (xfer->ops.end != NULL)
		xfer->ops.end(xfer);

	if (xfer->watcher != 0) {

void
gaim_xfer_cancel_remote(GaimXfer *xfer)
{
	GaimXferUiOps *ui_ops;
	gchar *msg, *escaped;
	GaimAccount *account;
	GaimBuddy *buddy;

	g_return_if_fail(xfer != NULL);

	gaim_request_close_with_handle(xfer);
	gaim_xfer_set_status(xfer, GAIM_XFER_STATUS_CANCEL_REMOTE);

	account = gaim_xfer_get_account(xfer);
	buddy = gaim_find_buddy(account, xfer->who);

	if (gaim_xfer_get_filename(xfer) != NULL)
	{
		escaped = g_markup_escape_text(gaim_xfer_get_filename(xfer), -1);
		msg = g_strdup_printf(_("%s canceled the transfer of %s"),
				buddy ? gaim_buddy_get_alias(buddy) : xfer->who, escaped);
		g_free(escaped);
	}
	else
	{
		msg = g_strdup_printf(_("%s canceled the file transfer"),
				buddy ? gaim_buddy_get_alias(buddy) : xfer->who);
	}
	gaim_xfer_conversation_write(xfer, msg, TRUE);
	gaim_xfer_error(gaim_xfer_get_type(xfer), account, xfer->who, msg);
	g_free(msg);

	if (gaim_xfer_get_type(xfer) == GAIM_XFER_SEND)
	{
		if (xfer->ops.cancel_send != NULL)

	gaim_xfer_unref(xfer);
}

void
gaim_xfer_error(GaimXferType type, GaimAccount *account, const char *who, const char *msg)
{
	char *title;

	g_return_if_fail(msg  != NULL);
	g_return_if_fail(type != GAIM_XFER_UNKNOWN);

	if (account) {
		GaimBuddy *buddy;
		buddy = gaim_find_buddy(account, who);
		if (buddy)
			who = gaim_buddy_get_alias(buddy);
	}

	if (type == GAIM_XFER_SEND)
		title = g_strdup_printf(_("File transfer to %s failed.\n"), who);
	else
		title = g_strdup_printf(_("File transfer from %s failed.\n"), who);

	gaim_notify_error(NULL, NULL, title, msg);

	g_free(title);
}