diff src/server.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]>

--- a/src/server.c	Sat Apr 02 16:38:33 2005 +0000
+++ b/src/server.c	Sat Apr 02 17:18:43 2005 +0000
@@ -1050,8 +1050,6 @@
 	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);
 
@@ -1060,19 +1058,14 @@
 
 	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);
+				   _("%s has invited %s to the chat room %s:\n%s"),
+				   who, gaim_account_get_username(account), name, message);
 	}
 	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);
+				   who, gaim_account_get_username(account), name);
 
 	cid->gc = gc;
 	cid->components = data;