Mercurial > pidgin.yaz

diff src/gtkimhtmltoolbar.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 1a97d5e88d12
children ffa44a5159e0
line wrap: on
line diff
--- a/src/gtkimhtmltoolbar.c	Sat Mar 26 01:20:31 2005 +0000
+++ b/src/gtkimhtmltoolbar.c	Sat Mar 26 02:43:49 2005 +0000
@@ -591,7 +591,7 @@
 	char *smiley_text, *escaped_smiley;
 
 	smiley_text = g_object_get_data(G_OBJECT(widget), "smiley_text");
-	escaped_smiley = gaim_escape_html(smiley_text);
+	escaped_smiley = g_markup_escape_text(smiley_text, -1);
 
 	gtk_imhtml_insert_smiley(GTK_IMHTML(toolbar->imhtml),
 							 GTK_IMHTML(toolbar->imhtml)->protocol_name,