Index: data/epiphany.schemas.in
===================================================================
RCS file: /cvs/gnome/epiphany/data/epiphany.schemas.in,v
retrieving revision 1.16
diff -u -p -r1.16 epiphany.schemas.in
--- data/epiphany.schemas.in	15 May 2003 16:25:11 -0000	1.16
+++ data/epiphany.schemas.in	15 May 2003 17:47:49 -0000
@@ -72,50 +72,6 @@
         </locale>
       </schema>
       <schema>
-        <key>/schemas/apps/epiphany/rendering/background_color</key>
-        <applyto>/apps/epiphany/rendering/background_color</applyto>
-        <owner>epiphany</owner>
-        <type>string</type>
-        <default>#FFFFFF</default>
-        <locale name="C">
-        <short>Default page background color</short>
-        <long>Default page background color in #RRGGBB hex format.</long>
-        </locale>
-      </schema>
-      <schema>
-        <key>/schemas/apps/epiphany/rendering/text_color</key>
-        <applyto>/apps/epiphany/rendering/text_color</applyto>
-        <owner>epiphany</owner>
-        <type>string</type>
-        <default>#000000</default>
-        <locale name="C">
-        <short>Default page text color</short>
-        <long>Default page text color in #RRGGBB hex format.</long>
-        </locale>
-      </schema>
-      <schema>
-        <key>/schemas/apps/epiphany/rendering/visited_link_color</key>
-        <applyto>/apps/epiphany/rendering/visited_link_color</applyto>
-        <owner>epiphany</owner>
-        <type>string</type>
-        <default>#FF0000</default>
-        <locale name="C">
-        <short>Default visited link color</short>
-        <long>Default color for visited links in #RRGGBB hex format.</long>
-        </locale>
-      </schema>
-      <schema>
-        <key>/schemas/apps/epiphany/rendering/unvisited_link_color</key>
-        <applyto>/apps/epiphany/rendering/unvisited_link_color</applyto>
-        <owner>epiphany</owner>
-        <type>string</type>
-        <default>#0000FF</default>
-        <locale name="C">
-        <short>Default unvisited link color</short>
-        <long>Default color for unvisited links in #RRGGBB hex format.</long>
-        </locale>
-      </schema>
-      <schema>
         <key>/schemas/apps/epiphany/rendering/underline_links</key>
         <applyto>/apps/epiphany/rendering/underline_links</applyto>
         <owner>epiphany</owner>
Index: data/glade/prefs-dialog.glade
===================================================================
RCS file: /cvs/gnome/epiphany/data/glade/prefs-dialog.glade,v
retrieving revision 1.8
diff -u -p -r1.8 prefs-dialog.glade
--- data/glade/prefs-dialog.glade	10 May 2003 16:39:09 -0000	1.8
+++ data/glade/prefs-dialog.glade	15 May 2003 17:48:14 -0000
@@ -1333,126 +1333,10 @@
 			      <property name="spacing">6</property>
 
 			      <child>
-				<widget class="GtkHBox" id="hbox163">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">6</property>
-
-				  <child>
-				    <widget class="GnomeColorPicker" id="background_cpick">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="dither">True</property>
-				      <property name="use_alpha">False</property>
-				      <property name="title" translatable="yes">Pick the background color</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="label1250">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">_Background</property>
-				      <property name="use_underline">True</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_CENTER</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">1</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkHBox" id="hbox165">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">6</property>
-
-				  <child>
-				    <widget class="GnomeColorPicker" id="text_cpick">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="dither">True</property>
-				      <property name="use_alpha">False</property>
-				      <property name="title" translatable="yes">Pick the text color</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="label1251">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">_Text</property>
-				      <property name="use_underline">True</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkCheckButton" id="use_syscolors_checkbutton">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Use s_ystem colors</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
 				<widget class="GtkCheckButton" id="use_colors_checkbutton">
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Al_ways use these colors</property>
+				  <property name="label" translatable="yes">Al_ways use desktop theme colors</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="active">False</property>
@@ -1463,185 +1347,6 @@
 				  <property name="padding">0</property>
 				  <property name="expand">False</property>
 				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox176">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">6</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label1280">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;b&gt;Links&lt;/b&gt;</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox166">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label1281">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">    </property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkVBox" id="vbox177">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">6</property>
-
-			      <child>
-				<widget class="GtkHBox" id="hbox167">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">6</property>
-
-				  <child>
-				    <widget class="GnomeColorPicker" id="unvisited_cpick">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="dither">True</property>
-				      <property name="use_alpha">False</property>
-				      <property name="title" translatable="yes">Pick the unvisited link color</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="label1249">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">_Unvisited link</property>
-				      <property name="use_underline">True</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_CENTER</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">1</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkHBox" id="hbox168">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">6</property>
-
-				  <child>
-				    <widget class="GnomeColorPicker" id="visited_cpick">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="dither">True</property>
-				      <property name="use_alpha">False</property>
-				      <property name="title" translatable="yes">Pick the visited link color</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="label1248">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">_Visited link</property>
-				      <property name="use_underline">True</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_CENTER</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">True</property>
 				</packing>
 			      </child>
 			    </widget>
Index: embed/ephy-embed-prefs.h
===================================================================
RCS file: /cvs/gnome/epiphany/embed/ephy-embed-prefs.h,v
retrieving revision 1.2
diff -u -p -r1.2 ephy-embed-prefs.h
--- embed/ephy-embed-prefs.h	10 May 2003 10:57:10 -0000	1.2
+++ embed/ephy-embed-prefs.h	15 May 2003 17:48:15 -0000
@@ -10,12 +10,7 @@
 #define CONF_RENDERING_FONT_MIN_SIZE "/apps/epiphany/rendering/font_min_size"
 #define CONF_RENDERING_LANGUAGE "/apps/epiphany/rendering/lang"
 #define CONF_RENDERING_USE_OWN_COLORS "/apps/epiphany/rendering/use_own_colors"
-#define CONF_RENDERING_USE_SYSTEM_COLORS "/apps/epiphany/rendering/use_system_colors"
 #define CONF_RENDERING_USE_OWN_FONTS "/apps/epiphany/rendering/use_own_fonts"
-#define CONF_RENDERING_BG_COLOR "/apps/epiphany/rendering/background_color"
-#define CONF_RENDERING_TEXT_COLOR "/apps/epiphany/rendering/text_color"
-#define CONF_RENDERING_VISITED_LINKS "/apps/epiphany/rendering/visited_link_color"
-#define CONF_RENDERING_UNVISITED_LINKS "/apps/epiphany/rendering/unvisited_link_color"
 #define CONF_RENDERING_UNDERLINE_LINKS "/apps/epiphany/rendering/underline_links"
 #define CONF_SECURITY_ALLOW_POPUPS "/apps/epiphany/security/allow_popups"
 #define CONF_SECURITY_JAVA_ENABLED "/apps/epiphany/security/java_enabled"
Index: embed/mozilla/default-prefs.js
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/default-prefs.js,v
retrieving revision 1.2
diff -u -p -r1.2 default-prefs.js
--- embed/mozilla/default-prefs.js	13 Apr 2003 10:12:32 -0000	1.2
+++ embed/mozilla/default-prefs.js	15 May 2003 17:48:16 -0000
@@ -22,3 +22,6 @@ user_pref("network.dir.generate_html", t
 user_pref("security.warn_entering_secure", false);
 user_pref("security.warn_leaving_secure", false);
 user_pref("security.warn_submit_insecure", false);
+
+// Always use the system colors if a page doesn't specify its own.
+user_pref("browser.display.use_system_colors", true);
Index: embed/mozilla/mozilla-notifiers.cpp
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/mozilla-notifiers.cpp,v
retrieving revision 1.7
diff -u -p -r1.7 mozilla-notifiers.cpp
--- embed/mozilla/mozilla-notifiers.cpp	10 May 2003 16:39:10 -0000	1.7
+++ embed/mozilla/mozilla-notifiers.cpp	15 May 2003 17:48:20 -0000
@@ -136,10 +136,6 @@ conversion_table [] =
 {
 	{ CONF_SECURITY_JAVA_ENABLED, BOOL_PREF, "security.enable_java"},
 	{ CONF_SECURITY_JAVASCRIPT_ENABLED, BOOL_PREF, "javascript.enabled"},
-	{ CONF_RENDERING_BG_COLOR, STRING_PREF, "browser.display.background_color"},
-	{ CONF_RENDERING_TEXT_COLOR, STRING_PREF, "browser.display.foreground_color"},
-	{ CONF_RENDERING_UNVISITED_LINKS, STRING_PREF, "browser.anchor_color"},
-	{ CONF_RENDERING_VISITED_LINKS, STRING_PREF, "browser.visited_color"},
 	{ CONF_RENDERING_UNDERLINE_LINKS, BOOL_PREF, "browser.underline_anchors"},
 	{ CONF_NETWORK_PROXY_AUTO_URL, STRING_PREF, "network.proxy.autoconfig_url"},
 	{ CONF_NETWORK_HTTP_PROXY, STRING_PREF, "network.proxy.http"},
@@ -155,7 +151,6 @@ conversion_table [] =
 	{ CONF_NETWORK_DISK_CACHE, INT_PREF, "browser.cache.disk.capacity"},
 	{ CONF_NETWORK_CACHE_COMPARE, INT_PREF, "browser.cache.check_doc_frequency"},
 	{ CONF_SECURITY_COOKIES_ACCEPT, BOOL_PREF, "network.cookie.warnAboutCookies"},
-	{ CONF_RENDERING_USE_SYSTEM_COLORS, BOOL_PREF, "browser.display.use_system_colors"},
 	{ NULL, 0, NULL }
 };
Index: src/prefs-dialog.c
===================================================================
RCS file: /cvs/gnome/epiphany/src/prefs-dialog.c,v
retrieving revision 1.14
diff -u -p -r1.14 prefs-dialog.c
--- src/prefs-dialog.c	10 May 2003 16:39:11 -0000	1.14
+++ src/prefs-dialog.c	15 May 2003 17:48:37 -0000
@@ -208,11 +208,6 @@ enum
 	VARIABLE_SIZE_PROP,
 	MIN_SIZE_PROP,
 	PROPORTIONAL_PROP,
-	BACKGROUND_PROP,
-	TEXT_PROP,
-	UNVISITED_PROP,
-	VISITED_PROP,
-	USE_SYSCOLORS_PROP,
 	USE_COLORS_PROP,
 	USE_FONTS_PROP,
 
@@ -250,11 +245,6 @@ EphyDialogProperty properties [] =
 	{ VARIABLE_SIZE_PROP, "variable_size_spinbutton", NULL, PT_NORMAL, NULL },
 	{ MIN_SIZE_PROP, "min_size_spinbutton", NULL, PT_NORMAL, NULL },
 	{ PROPORTIONAL_PROP, "proportional_optionmenu", CONF_RENDERING_DEFAULT_FONT, PT_AUTOAPPLY, NULL },
-	{ BACKGROUND_PROP, "background_cpick", CONF_RENDERING_BG_COLOR, PT_AUTOAPPLY, NULL },
-	{ TEXT_PROP, "text_cpick", CONF_RENDERING_TEXT_COLOR, PT_AUTOAPPLY, NULL },
-	{ UNVISITED_PROP, "unvisited_cpick", CONF_RENDERING_UNVISITED_LINKS, PT_AUTOAPPLY, NULL },
-	{ VISITED_PROP, "visited_cpick", CONF_RENDERING_VISITED_LINKS, PT_AUTOAPPLY, NULL },
-	{ USE_SYSCOLORS_PROP, "use_syscolors_checkbutton", CONF_RENDERING_USE_SYSTEM_COLORS, PT_AUTOAPPLY, NULL },
 	{ USE_COLORS_PROP, "use_colors_checkbutton", CONF_RENDERING_USE_OWN_COLORS, PT_AUTOAPPLY, NULL },
 	{ USE_FONTS_PROP, "use_fonts_checkbutton", CONF_RENDERING_USE_OWN_FONTS, PT_AUTOAPPLY, NULL },
 
