# HG changeset patch # User Eric Warmenhoven # Date 968203358 0 # Node ID 868e7a30b48a25422e47b75697ad89cedcdf0ef9 # Parent 2804dc8e9ba0adc81e77476defb1c6e17fb13f54 [gaim-migrate @ 853] ignore incoming colors works better now committer: Tailor Script diff -r 2804dc8e9ba0 -r 868e7a30b48a src/conversation.c --- a/src/conversation.c Tue Sep 05 21:30:43 2000 +0000 +++ b/src/conversation.c Wed Sep 06 01:22:38 2000 +0000 @@ -1276,10 +1276,10 @@ if (colorv != -1) { sprintf(buf2, "", colorv); - gtk_html_append_text(GTK_HTML(c->text), buf2, 0); + gtk_html_append_text(GTK_HTML(c->text), buf2, (display_options & OPT_DISP_IGNORE_COLOUR) ? HTML_OPTION_NO_COLOURS : 0); } - gtk_html_append_text(GTK_HTML(c->text), buf, 0); + gtk_html_append_text(GTK_HTML(c->text), buf, (display_options & OPT_DISP_IGNORE_COLOUR) ? HTML_OPTION_NO_COLOURS : 0); if (display_options & OPT_DISP_SHOW_SMILEY) { @@ -1291,9 +1291,9 @@ } if (colorv != -1) { - gtk_html_append_text(GTK_HTML(c->text), "", 0); + gtk_html_append_text(GTK_HTML(c->text), "", (display_options & OPT_DISP_IGNORE_COLOUR) ? HTML_OPTION_NO_COLOURS : 0); } - gtk_html_append_text(GTK_HTML(c->text), "
", 0); + gtk_html_append_text(GTK_HTML(c->text), "
", (display_options & OPT_DISP_IGNORE_COLOUR) ? HTML_OPTION_NO_COLOURS : 0); if ((general_options & OPT_GEN_LOG_ALL) || find_log_info(c->name)) { diff -r 2804dc8e9ba0 -r 868e7a30b48a src/dialogs.c --- a/src/dialogs.c Tue Sep 05 21:30:43 2000 +0000 +++ b/src/dialogs.c Wed Sep 06 01:22:38 2000 +0000 @@ -1691,7 +1691,7 @@ if (display_options & OPT_DISP_SHOW_SMILEY) write_html_with_smileys(b->window, b->text, info); else - gtk_html_append_text(GTK_HTML(b->text), info, 0); + gtk_html_append_text(GTK_HTML(b->text), info, (display_options & OPT_DISP_IGNORE_COLOUR) ? HTML_OPTION_NO_COLOURS : 0); gtk_html_append_text(GTK_HTML(b->text), "", 0); gtk_adjustment_set_value(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(sw)), 0);