# HG changeset patch
# User Tim Ringenbach <marv@pidgin.im>
# Date 1085291544 0
# Node ID 1bd8bda384e74c683dd5ed5c45197dde7879955a
# Parent  48f255b2518d0572a67e76fc72ad902128ec83a6
[gaim-migrate @ 9803]
Stu Tomlinson fixed a bug where msn would lock up because we sent it
an unescaped & from the smiley dialog.
Also thanks to Bleeter because I sent him dog smileys to see if I'd lock
up.

committer: Tailor Script <tailor@pidgin.im>

diff -r 48f255b2518d -r 1bd8bda384e7 src/gtkimhtmltoolbar.c
--- a/src/gtkimhtmltoolbar.c	Sun May 23 04:30:23 2004 +0000
+++ b/src/gtkimhtmltoolbar.c	Sun May 23 05:52:24 2004 +0000
@@ -520,12 +520,16 @@
 static void
 insert_smiley_text(GtkWidget *widget, GtkIMHtmlToolbar *toolbar)
 {
-	char *smiley_text = g_object_get_data(G_OBJECT(widget), "smiley_text");
+	char *smiley_text, *escaped_smiley;
+
+	smiley_text = g_object_get_data(G_OBJECT(widget), "smiley_text");
+	escaped_smiley = gaim_escape_html(smiley_text);
 
 	gtk_imhtml_insert_smiley(GTK_IMHTML(toolbar->imhtml),
 							 GTK_IMHTML(toolbar->imhtml)->protocol_name,
-							 smiley_text);
+							 escaped_smiley);
 
+	g_free(escaped_smiley);
 	close_smiley_dialog(NULL, NULL, toolbar);
 }