comparison src/ft.c @ 10774:d83f745c997b

[gaim-migrate @ 12383] Some escaping stuff, all over the place. Various escaping fixes in the IRC prpl. The core and plugins only need to escape text if it's going to be shown in a gtkimhtml or equivalent - such as writing to a conversation window, or gaim_notify_{formatted,userinfo} The primary and secondary text for all notify and request API functions do NOT need to be escaped by the core or plugins, because whether html-like markup is required for these is UI dependent. Now we always escape these in the Gtk UI request & notify ops. Should I backport any of the above to oldstatus? I also removed gaim_chat_get_display_name() - it was almost a duplicate of gaim_chat_get_name(), and it leaked. committer: Tailor Script <[e-mail]>

10773:888d4c328be5

static void
gaim_xfer_conversation_write(GaimXfer *xfer, char *message, gboolean is_error)
{
	GaimConversation *conv = NULL;
	GString *gs_message = NULL;
	GaimMessageFlags flags = GAIM_MESSAGE_SYSTEM;

	g_return_if_fail(xfer != NULL);
	g_return_if_fail(message != NULL);

	conv = gaim_find_conversation_with_account(GAIM_CONV_IM, xfer->who,
											   gaim_xfer_get_account(xfer));

	if (conv == NULL)
		return;

	gs_message = g_string_new(message);

	if (is_error)
		flags = GAIM_MESSAGE_ERROR;

	gaim_conversation_write(conv, NULL, gs_message->str, flags, time(NULL));
	g_string_free(gs_message, TRUE);
}

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

}

static void
gaim_xfer_ask_recv(GaimXfer *xfer)
{
	char *buf, *size_buf, *escaped;
	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)"),
					      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);

void
gaim_xfer_cancel_local(GaimXfer *xfer)
{
	GaimXferUiOps *ui_ops;
	char *msg = NULL, *escaped;

	g_return_if_fail(xfer != NULL);

	gaim_xfer_set_status(xfer, GAIM_XFER_STATUS_CANCEL_LOCAL);

	if (gaim_xfer_get_filename(xfer) != NULL)
	{
		escaped = g_markup_escape_text(gaim_xfer_get_filename(xfer), -1);
		msg = g_strdup_printf(_("You canceled the transfer of %s"),
							  escaped);
		g_free(escaped);
	}
	else
	{
		msg = g_strdup_printf(_("File transfer cancelled"));
	}

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

	g_return_if_fail(xfer != NULL);

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

10774:d83f745c997b

static void
gaim_xfer_conversation_write(GaimXfer *xfer, char *message, gboolean is_error)
{
	GaimConversation *conv = NULL;
	GaimMessageFlags flags = GAIM_MESSAGE_SYSTEM;
	char *escaped;

	g_return_if_fail(xfer != NULL);
	g_return_if_fail(message != NULL);

	conv = gaim_find_conversation_with_account(GAIM_CONV_IM, xfer->who,
											   gaim_xfer_get_account(xfer));

	if (conv == NULL)
		return;

	escaped = g_markup_escape_text(message, -1);

	if (is_error)
		flags = GAIM_MESSAGE_ERROR;

	gaim_conversation_write(conv, NULL, escaped, flags, time(NULL));
	g_free(escaped);
}

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

}

static void
gaim_xfer_ask_recv(GaimXfer *xfer)
{
	char *buf, *size_buf;
	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);
			buf = g_strdup_printf(_("%s wants to send you %s (%s)"),
					      buddy ? gaim_buddy_get_alias(buddy) : xfer->who,
					      gaim_xfer_get_filename(xfer), size_buf);
			g_free(size_buf);
		}
		else
		{
			buf = g_strdup_printf(_("%s wants to send you a file"),
						buddy ? gaim_buddy_get_alias(buddy) : xfer->who);

void
gaim_xfer_cancel_local(GaimXfer *xfer)
{
	GaimXferUiOps *ui_ops;
	char *msg = NULL;

	g_return_if_fail(xfer != NULL);

	gaim_xfer_set_status(xfer, GAIM_XFER_STATUS_CANCEL_LOCAL);

	if (gaim_xfer_get_filename(xfer) != NULL)
	{
		msg = g_strdup_printf(_("You canceled the transfer of %s"),
							  gaim_xfer_get_filename(xfer));
	}
	else
	{
		msg = g_strdup_printf(_("File transfer cancelled"));
	}

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

	g_return_if_fail(xfer != NULL);

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

	if (gaim_xfer_get_filename(xfer) != NULL)
	{
		msg = g_strdup_printf(_("%s canceled the transfer of %s"),
				buddy ? gaim_buddy_get_alias(buddy) : xfer->who, gaim_xfer_get_filename(xfer));
	}
	else
	{
		msg = g_strdup_printf(_("%s canceled the file transfer"),
				buddy ? gaim_buddy_get_alias(buddy) : xfer->who);