changeset 667:45ed2ca0756e

[gaim-migrate @ 677] ignore white bg committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Fri, 11 Aug 2000 03:17:31 +0000
parents 71ea550c22ac
children c9b66c710283
files TODO src/gaim.h src/gtkhtml.c src/prefs.c
diffstat 4 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/TODO	Fri Aug 11 03:04:29 2000 +0000
+++ b/TODO	Fri Aug 11 03:17:31 2000 +0000
@@ -9,8 +9,3 @@
 		on your buddy list.  This won't be too hard it'll just
 		take a bit of work.  Maybe we'll save this one for the
 		release after our next release.
-	Possibly make the background font colour #FFFFFF represent "nothing".
-		Most windows clients send <BODY BGCOLOR="#FFFFFF"> and </BODY>
-		around the users text.  If you have a GTK theme this causes
-		a funky white background behind the text.  We can do this
-		by default or make it an option -- either way it'll be handy :)
--- a/src/gaim.h	Fri Aug 11 03:04:29 2000 +0000
+++ b/src/gaim.h	Fri Aug 11 03:17:31 2000 +0000
@@ -386,7 +386,7 @@
 #define TYPE_SIGNOFF   4
 #define TYPE_KEEPALIVE 5
 
-#define REVISION "gaim:$Revision: 676 $"
+#define REVISION "gaim:$Revision: 677 $"
 #define FLAPON "FLAPON\r\n\r\n"
 
 #define ROAST "Tic/Toc"
@@ -482,6 +482,7 @@
 #define OPT_DISP_SHOW_BUDDYTICKER 0x00000200
 #define OPT_DISP_COOL_LOOK       0x00000400
 #define OPT_DISP_CHAT_LOGON      0x00000800
+#define OPT_DISP_IGN_WHITE       0x00001000
  
 extern int sound_options;
 #define OPT_SOUND_LOGIN          0x00000001
--- a/src/gtkhtml.c	Fri Aug 11 03:04:29 2000 +0000
+++ b/src/gtkhtml.c	Fri Aug 11 03:17:31 2000 +0000
@@ -3422,8 +3422,11 @@
 					if (sscanf(d, "%x", &colorv)
 						&& !(options & HTML_OPTION_NO_COLOURS))
 					{
-						current->bgcol = get_color(colorv, map);
-						current->ownbg = 1;
+						if (colorv == 0xffffff &&
+						    !(display_options & OPT_DISP_IGN_WHITE)) {
+							current->bgcol = get_color(colorv, map);
+							current->ownbg = 1;
+						}
 					}
 				}
 				else if (!strncasecmp(tag, "/FONT", strlen("/FONT")))
--- a/src/prefs.c	Fri Aug 11 03:04:29 2000 +0000
+++ b/src/prefs.c	Fri Aug 11 03:17:31 2000 +0000
@@ -364,6 +364,7 @@
 
 	gaim_button(_("Show graphical smileys"), &display_options, OPT_DISP_SHOW_SMILEY, box);
 	gaim_button(_("Ignore incoming colors"), &display_options, OPT_DISP_IGNORE_COLOUR, box);
+	gaim_button(_("Ignore white backgrounds"), &display_options, OPT_DISP_IGN_WHITE, box);
 	gaim_button(_("Show timestamp on messages"), &display_options, OPT_DISP_SHOW_TIME, box);
 
 	sep = gtk_hseparator_new();