gaim/gaim

Don't show smileys in Help -> About, apparently some people put smileys in
oldstatus
2005-01-17, Stu Tomlinson
3b39f821a491
Parents bca297b01c96
Children 240bf3f5a16e
Don't show smileys in Help -> About, apparently some people put smileys in
their compiler flags.
2 files changed, 12 insertions(+), 8 deletions(-)
  • +1 -0
    src/gtkdialogs.c
  • +11 -8
    src/gtkimhtml.c
    • --- a/src/gtkdialogs.c Mon Jan 17 06:44:19 2005 -0500
    +++ b/src/gtkdialogs.c Mon Jan 17 21:12:29 2005 -0500
    @@ -229,6 +229,7 @@
    text = gtk_imhtml_new(NULL, NULL);
    gtk_container_add(GTK_CONTAINER(sw), text);
    + gtk_imhtml_set_format_functions(GTK_IMHTML(text), GTK_IMHTML_ALL ^ GTK_IMHTML_SMILEY);
    gaim_setup_imhtml(text);
    str = g_string_sized_new(4096);
    --- a/src/gtkimhtml.c Mon Jan 17 06:44:19 2005 -0500
    +++ b/src/gtkimhtml.c Mon Jan 17 21:12:29 2005 -0500
    @@ -3915,14 +3915,17 @@
    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);
    + }
    }
    }