Mercurial > pidgin.yaz
changeset 9027:1bd8bda384e7
[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>
| author | Tim Ringenbach <marv@pidgin.im> |
|---|---|
| date | Sun, 23 May 2004 05:52:24 +0000 |
| parents | 48f255b2518d |
| children | 6fd7de357672 |
| files | src/gtkimhtmltoolbar.c |
| diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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); }