diff src/protocols/silc/chat.c @ 10732:c4cb90065e1d

[gaim-migrate @ 12334] "gaim_escape_html (according to Ethan) predates g_markup_escape_text. Current code in Gaim uses both functions. This patch removes gaim_escape_html from the API and replaces all calls in the Gaim tree with g_markup_escape_text. I included a ChangeLog.API note. As far as I can tell, this still works perfectly. This is obviously intended for HEAD only, as it removes a public function." --rlaager this was discussed extensively this morning committer: Tailor Script <[e-mail]>

--- a/src/protocols/silc/chat.c	Sat Mar 26 01:20:31 2005 +0000
+++ b/src/protocols/silc/chat.c	Sat Mar 26 02:43:49 2005 +0000
@@ -114,7 +114,7 @@
 	}
 
 	s = g_string_new("");
-	tmp2 = gaim_escape_html(channel->channel_name);
+	tmp2 = g_markup_escape_text(channel->channel_name, -1);
 	g_string_append_printf(s, _("<b>Channel Name:</b> %s"), tmp2);
 	g_free(tmp2);
 	if (channel->user_list && silc_hash_table_count(channel->user_list))
@@ -124,7 +124,7 @@
 	silc_hash_table_list(channel->user_list, &htl);
 	while (silc_hash_table_get(&htl, NULL, (void *)&chu)) {
 		if (chu->mode & SILC_CHANNEL_UMODE_CHANFO) {
-			tmp2 = gaim_escape_html(chu->client->nickname);
+			tmp2 = g_markup_escape_text(chu->client->nickname, -1);
 			g_string_append_printf(s, _("<br><b>Channel Founder:</b> %s"),
 					       tmp2);
 			g_free(tmp2);
@@ -141,7 +141,7 @@
 				       silc_hmac_get_name(channel->hmac));
 
 	if (channel->topic) {
-		tmp2 = gaim_escape_html(channel->topic);
+		tmp2 = g_markup_escape_text(channel->topic, -1);
 		g_string_append_printf(s, _("<br><b>Channel Topic:</b><br>%s"), tmp2);
 		g_free(tmp2);
 	}
@@ -1312,7 +1312,7 @@
 					       flags, (unsigned char *)msg2,
 					       strlen(msg2), TRUE);
 	if (ret) {
-		tmp = gaim_escape_html(msg);
+		tmp = g_markup_escape_text(msg, -1);
 		serv_got_chat_in(gc, id, gaim_connection_get_display_name(gc), 0, tmp,
 				 time(NULL));
 		g_free(tmp);