diff src/protocols/oscar/oscar.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/oscar/oscar.c	Sat Mar 26 01:20:31 2005 +0000
+++ b/src/protocols/oscar/oscar.c	Sat Mar 26 02:43:49 2005 +0000
@@ -3411,7 +3411,7 @@
 	 */
 	if (aim_sn_is_icq(gaim_account_get_username(account)) && aim_sn_is_icq(userinfo->sn)) {
 		/* being recevied by ICQ from ICQ - escape HTML so it is displayed as sent */
-		gchar *tmp2 = gaim_escape_html(tmp);
+		gchar *tmp2 = g_markup_escape_text(tmp, -1);
 		g_free(tmp);
 		tmp = tmp2;
 	}
@@ -3806,7 +3806,7 @@
 				gchar *tmp;
 
 				/* If the message came from an ICQ user then escape any HTML */
-				tmp = gaim_escape_html(msg2[0]);
+				tmp = g_markup_escape_text(msg2[0], -1);
 
 				if (t) { /* This is an offline message */
 					/* The timestamp is UTC-ish, so we need to get the offset */
@@ -5611,7 +5611,7 @@
 			if (aim_sn_is_icq(gaim_account_get_username(account))) {
 				/* from an ICQ user */
 				tmpmsg2 = gaim_strdup_withhtml(message);
-				tmpmsg = gaim_escape_html(tmpmsg2);
+				tmpmsg = g_markup_escape_text(tmpmsg2, -1);
 				g_free(tmpmsg2);
 			} else
 				tmpmsg = gaim_strdup_withhtml(message);
@@ -6795,7 +6795,7 @@
 				gchar *tmp1, *tmp2;
 				tmp2 = gaim_markup_strip_html(away_utf8);
 				g_free(away_utf8);
-				tmp1 = gaim_escape_html(tmp2);
+				tmp1 = g_markup_escape_text(tmp2, -1);
 				g_free(tmp2);
 				tmp2 = gaim_str_sub_away_formatters(tmp1, gaim_account_get_username(gaim_connection_get_account(gc)));
 				g_free(tmp1);