changeset 843:868e7a30b48a

[gaim-migrate @ 853] ignore incoming colors works better now committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Wed, 06 Sep 2000 01:22:38 +0000
parents 2804dc8e9ba0
children fae1d64b0278
files src/conversation.c src/dialogs.c
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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, "<BODY BGCOLOR=\"#%x\">", 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), "</BODY>", 0);
+			gtk_html_append_text(GTK_HTML(c->text), "</BODY>", (display_options & OPT_DISP_IGNORE_COLOUR) ? HTML_OPTION_NO_COLOURS : 0);
 		}
-                gtk_html_append_text(GTK_HTML(c->text), "<BR>", 0);
+                gtk_html_append_text(GTK_HTML(c->text), "<BR>", (display_options & OPT_DISP_IGNORE_COLOUR) ? HTML_OPTION_NO_COLOURS : 0);
 
 
                 if ((general_options & OPT_GEN_LOG_ALL) || find_log_info(c->name)) {
--- 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), "</BODY>", 0);
 
 	gtk_adjustment_set_value(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(sw)), 0);