Mercurial > pidgin

comparison src/gtkimhtmltoolbar.c @ 9027:1bd8bda384e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 b24967757d46
children 812e7aa7eafa
comparison
equal deleted inserted replaced
9026:48f255b2518d 9027:1bd8bda384e7
518 518
519 519
520 static void 520 static void
521 insert_smiley_text(GtkWidget *widget, GtkIMHtmlToolbar *toolbar) 521 insert_smiley_text(GtkWidget *widget, GtkIMHtmlToolbar *toolbar)
522 { 522 {
523 char *smiley_text = g_object_get_data(G_OBJECT(widget), "smiley_text"); 523 char *smiley_text, *escaped_smiley;
524
525 smiley_text = g_object_get_data(G_OBJECT(widget), "smiley_text");
526 escaped_smiley = gaim_escape_html(smiley_text);
524 527
525 gtk_imhtml_insert_smiley(GTK_IMHTML(toolbar->imhtml), 528 gtk_imhtml_insert_smiley(GTK_IMHTML(toolbar->imhtml),
526 GTK_IMHTML(toolbar->imhtml)->protocol_name, 529 GTK_IMHTML(toolbar->imhtml)->protocol_name,
527 smiley_text); 530 escaped_smiley);
528 531
532 g_free(escaped_smiley);
529 close_smiley_dialog(NULL, NULL, toolbar); 533 close_smiley_dialog(NULL, NULL, toolbar);
530 } 534 }
531 535
532 536
533 static void add_smiley(GtkIMHtmlToolbar *toolbar, GtkWidget *table, int row, int col, char *filename, char *face) 537 static void add_smiley(GtkIMHtmlToolbar *toolbar, GtkWidget *table, int row, int col, char *filename, char *face)