# # old_revision [2331ff0a5cbe7c0ae11fe5411c3aa8845715c9fd] # # patch "pidgin/gtkimhtml.c" # from [403285dc48be2eeeee9799f17e53817d90048253] # to [08e1d73e6d6ce5ff1ac4ceb1ffb945edf0858d0f] # # patch "pidgin/gtkimhtml.h" # from [f3a1884dcd575634acb1b27afea5e946b55cf44f] # to [e7c1f2020df4a3e53f7ac68b66dda443d3367406] # ============================================================ --- pidgin/gtkimhtml.c 403285dc48be2eeeee9799f17e53817d90048253 +++ pidgin/gtkimhtml.c 08e1d73e6d6ce5ff1ac4ceb1ffb945edf0858d0f @@ -3191,6 +3191,19 @@ void gtk_imhtml_insert_html_at_iter(GtkI gtk_imhtml_toggle_underline(imhtml); font->underline = 1; } + + if (oldfont) + { + font->strike = oldfont->strike; + } + if (textdec && font->strike != 1 + && g_ascii_strcasecmp(textdec, "line-through") == 0 + && (imhtml->format_functions & GTK_IMHTML_STRIKE) + && !(options & GTK_IMHTML_NO_FORMATTING)) + { + gtk_imhtml_toggle_strike(imhtml); + font->strike = 1; + } g_free(textdec); if (oldfont) @@ -3243,6 +3256,8 @@ void gtk_imhtml_insert_html_at_iter(GtkI gtk_imhtml_font_set_size(imhtml, 3); if (font->underline && !(options & GTK_IMHTML_NO_FORMATTING)) gtk_imhtml_toggle_underline(imhtml); + if (font->strike && !(options & GTK_IMHTML_NO_FORMATTING)) + gtk_imhtml_toggle_strike(imhtml); if (font->bold && !(options & GTK_IMHTML_NO_FORMATTING)) gtk_imhtml_toggle_bold(imhtml); if (!(options & GTK_IMHTML_NO_FONTS)) @@ -3261,6 +3276,9 @@ void gtk_imhtml_insert_html_at_iter(GtkI if ((font->underline != oldfont->underline) && !(options & GTK_IMHTML_NO_FORMATTING)) gtk_imhtml_toggle_underline(imhtml); + if ((font->strike != oldfont->strike) && !(options & GTK_IMHTML_NO_FORMATTING)) + gtk_imhtml_toggle_strike(imhtml); + if (((font->bold && !oldfont->bold) || (oldfont->bold && !font->bold)) && !(options & GTK_IMHTML_NO_FORMATTING)) gtk_imhtml_toggle_bold(imhtml); ============================================================ --- pidgin/gtkimhtml.h f3a1884dcd575634acb1b27afea5e946b55cf44f +++ pidgin/gtkimhtml.h e7c1f2020df4a3e53f7ac68b66dda443d3367406 @@ -171,6 +171,7 @@ struct _GtkIMHtmlFontDetail { gchar *sml; gboolean underline; gshort bold; + gboolean strike; }; struct _GtkSmileyTree {