comparison src/server.c @ 10733:d5f2ebf79429

[gaim-migrate @ 12335] " This fixes one of the bugs decadix found. The symptom was an empty box with two buttons: Cancel and Accept. For this one, I believe the escaping belongs in this function and not the prpls because that's how the escaping was being done for message. I just added escaping on two other variables." --rlaager committer: Tailor Script <[e-mail]>

10732:c4cb90065e1d

						  const char *who, const char *message, GHashTable *data)
{
	GaimAccount *account;
	char buf2[BUF_LONG];
	struct chat_invite_data *cid = g_new0(struct chat_invite_data, 1);

	account = gaim_connection_get_account(gc);

	gaim_signal_emit(gaim_conversations_get_handle(),
					 "chat-invited", account, who, name, message, data);

	if (message != NULL)
	{
		char *escaped = g_markup_escape_text(message, -1);
		g_snprintf(buf2, sizeof(buf2),
				   _("%s has invited %s to the chat room %s:\n<b>%s</b>"),
				   who, gaim_account_get_username(account), name, escaped);
		g_free(escaped);
	}
	else
		g_snprintf(buf2, sizeof(buf2),
				   _("%s has invited %s to the chat room %s\n"),
				   who, gaim_account_get_username(account), name);

	cid->gc = gc;
	cid->components = data;

	gaim_request_accept_cancel(gc, NULL, _("Accept chat invitation?"), buf2,

10733:d5f2ebf79429

						  const char *who, const char *message, GHashTable *data)
{
	GaimAccount *account;
	char buf2[BUF_LONG];
	struct chat_invite_data *cid = g_new0(struct chat_invite_data, 1);
	char *name_escaped = g_markup_escape_text(name, -1);
	char *who_escaped = g_markup_escape_text(who, -1);

	account = gaim_connection_get_account(gc);

	gaim_signal_emit(gaim_conversations_get_handle(),
					 "chat-invited", account, who, name, message, data);

	if (message != NULL)
	{
		char *message_escaped = g_markup_escape_text(message, -1);
		g_snprintf(buf2, sizeof(buf2),
				   _("%s has invited %s to the chat room %s:\n<b>%s</b>"),
				   who_escaped, gaim_account_get_username(account), name_escaped, message_escaped);
		g_free(message_escaped);
	}
	else
		g_snprintf(buf2, sizeof(buf2),
				   _("%s has invited %s to the chat room %s\n"),
				   who_escaped, gaim_account_get_username(account), name_escaped);

	g_free(name_escaped);
	g_free(who_escaped);

	cid->gc = gc;
	cid->components = data;

	gaim_request_accept_cancel(gc, NULL, _("Accept chat invitation?"), buf2,