Mercurial > pidgin

diff src/gtkconv.c @ 10732:c4cb90065e1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Sat, 26 Mar 2005 02:43:49 +0000
parents 2f646d020011
children b7f0bc436179
line wrap: on
line diff
--- a/src/gtkconv.c	Sat Mar 26 01:20:31 2005 +0000
+++ b/src/gtkconv.c	Sat Mar 26 02:43:49 2005 +0000
@@ -307,7 +307,7 @@
 
 	if (!g_ascii_strcasecmp(args[0], "version")) {
 		tmp = g_strdup_printf(_("me is using Gaim v%s."), VERSION);
-		markup = gaim_escape_html(tmp);
+		markup = g_markup_escape_text(tmp, -1);
 
 		status = gaim_cmd_do_command(conv, tmp, markup, error);
 
@@ -5349,7 +5349,7 @@
 		{
 			char *html_title,*label;
 
-			html_title = gaim_escape_html(title);
+			html_title = g_markup_escape_text(title, -1);
 
 			label = g_strdup_printf("<span color=\"%s\">%s</span>",
 			                        color, html_title);