From: Stu T. <nos...@us...> - 2005-01-18 02:12:05
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14947 Modified Files: gtkimhtml.c gtkdialogs.c Log Message: Don't show smileys in Help -> About, apparently some people put smileys in their compiler flags. Index: gtkimhtml.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v retrieving revision 1.382 retrieving revision 1.383 diff -u -d -p -r1.382 -r1.383 --- gtkimhtml.c 11 Jan 2005 17:24:55 -0000 1.382 +++ gtkimhtml.c 18 Jan 2005 02:11:49 -0000 1.383 @@ -3884,14 +3884,17 @@ void gtk_imhtml_insert_smiley_at_iter(Gt GtkTextChildAnchor *anchor; char *unescaped = gaim_unescape_html(smiley); - annipixbuf = gtk_smiley_tree_image(imhtml, sml, unescaped); - if(annipixbuf) { - if(gdk_pixbuf_animation_is_static_image(annipixbuf)) { - pixbuf = gdk_pixbuf_animation_get_static_image(annipixbuf); - if(pixbuf) - icon = gtk_image_new_from_pixbuf(pixbuf); - } else { - icon = gtk_image_new_from_animation(annipixbuf); + if (imhtml->format_functions & GTK_IMHTML_SMILEY) + { + annipixbuf = gtk_smiley_tree_image(imhtml, sml, unescaped); + if(annipixbuf) { + if(gdk_pixbuf_animation_is_static_image(annipixbuf)) { + pixbuf = gdk_pixbuf_animation_get_static_image(annipixbuf); + if(pixbuf) + icon = gtk_image_new_from_pixbuf(pixbuf); + } else { + icon = gtk_image_new_from_animation(annipixbuf); + } } } Index: gtkdialogs.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkdialogs.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -p -r1.36 -r1.37 --- gtkdialogs.c 12 Jan 2005 14:50:20 -0000 1.36 +++ gtkdialogs.c 18 Jan 2005 02:11:51 -0000 1.37 @@ -213,6 +213,7 @@ void gaim_gtkdialogs_about(GtkWidget *w, gtk_box_pack_start(GTK_BOX(vbox), logo, FALSE, FALSE, 0); frame = gaim_gtk_create_imhtml(FALSE, &text, NULL); + gtk_imhtml_set_format_functions(GTK_IMHTML(text), GTK_IMHTML_ALL ^ GTK_IMHTML_SMILEY); gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0); str = g_string_sized_new(4096); |