diff src/protocols/napster/napster.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/napster/napster.c	Sat Mar 26 01:20:31 2005 +0000
+++ b/src/protocols/napster/napster.c	Sat Mar 26 02:43:49 2005 +0000
@@ -293,7 +293,7 @@
 
 	case 205: /* MSG_CLIENT_PRIVMSG */
 		res = g_strsplit(buf, " ", 2);
-		buf2 = gaim_escape_html(res[1]);
+		buf2 = g_markup_escape_text(res[1], -1);
 		serv_got_im(gc, res[0], buf2, 0, time(NULL));
 		g_free(buf2);
 		g_strfreev(res);
@@ -354,7 +354,7 @@
 
 	case 404: /* MSG_SERVER_NOSUCH */
 		/* abused by opennap servers to broadcast stuff */
-		buf2 = gaim_escape_html(buf);
+		buf2 = g_markup_escape_text(buf, -1);
 		serv_got_im(gc, "server", buf2, 0, time(NULL));
 		g_free(buf2);
 		break;
@@ -409,20 +409,20 @@
 	case 621:
 	case 622: /* MSG_CLIENT_MOTD */
 		/* also replaces MSG_SERVER_MOTD, so we should display it */
-		buf2 = gaim_escape_html(buf);
+		buf2 = g_markup_escape_text(buf, -1);
 		serv_got_im(gc, "motd", buf2, 0, time(NULL));
 		g_free(buf2);
 		break;
 
 	case 627: /* MSG_CLIENT_WALLOP */
 		/* abused by opennap server maintainers to broadcast stuff */
-		buf2 = gaim_escape_html(buf);
+		buf2 = g_markup_escape_text(buf, -1);
 		serv_got_im(gc, "wallop", buf2, 0, time(NULL));
 		g_free(buf2);
 		break;
 
 	case 628: /* MSG_CLIENT_ANNOUNCE */
-		buf2 = gaim_escape_html(buf);
+		buf2 = g_markup_escape_text(buf, -1);
 		serv_got_im(gc, "announce", buf2, 0, time(NULL));
 		g_free(buf);
 		break;