R data/default-prefs-gecko-1-8.js: R data/default-prefs-mozilla.js: R

2006-05-11  Christian Persch  <chpe@cvs.gnome.org>

	* data/Makefile.am:
	* data/default-prefs-common.js:
	R data/default-prefs-gecko-1-8.js:
	R data/default-prefs-mozilla.js:
	R data/default-prefs-toolkit.js:

	Merge those into -common prefs.

6 files changed, 40 insertions, 45 deletions

diff --git a/ChangeLog b/ChangeLog
index 6faa13414..0487811a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-05-11  Christian Persch  <chpe@cvs.gnome.org>
+
+	* data/Makefile.am:
+	* data/default-prefs-common.js:
+	R data/default-prefs-gecko-1-8.js:
+	R data/default-prefs-mozilla.js:
+	R data/default-prefs-toolkit.js:
+
+	Merge those into -common prefs.
+
 2006-05-11  Wouter Bolsterlee  <uws+gnome@xs4all.nl>
 
 	* src/ephy-find-toolbar.c: (ephy_find_toolbar_find_next),
diff --git a/data/Makefile.am b/data/Makefile.am
index 7f9fd11ed..de235dfdc 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -6,18 +6,10 @@ SUBDIRS = art chrome glade ui
 @INTLTOOL_XML_RULE@
 
 default_prefs_in_FILES = \
-	default-prefs-common.js		\
-	default-prefs-mozilla.js	\
-	default-prefs-toolkit.js	\
-	default-prefs-gecko-1-8.js
+	default-prefs-common.js
 
 default_prefs_files = \
-	default-prefs-common.js			\
-	default-prefs-$(MOZILLA_FLAVOUR).js
-
-if HAVE_GECKO_1_8
-default_prefs_files += default-prefs-gecko-1-8.js
-endif
+	default-prefs-common.js
 
 default-prefs.js: $(default_prefs_files)
 	cat $^ > $@
diff --git a/data/default-prefs-common.js b/data/default-prefs-common.js
index 026be8255..dd1b16ddd 100644
--- a/data/default-prefs-common.js
+++ b/data/default-prefs-common.js
@@ -68,8 +68,34 @@ pref("network.protocol-handler.warn-external.webcal", false);
 // disable xpinstall
 pref("xpinstall.enabled", false);
 
-// enable typeahead find
-pref("accessibility.typeaheadfind", false);
+// enable plugin finder
+pref("plugin.default_plugin_disabled", true);
+
+// enable locale matching
+pref("intl.locale.matchOS", true);
+
+// enable fixed-up typeaheadfind extension
+pref("accessibility.typeaheadfindsea", false);
+pref("accessibility.typeaheadfindsea.autostart", true);
+pref("accessibility.typeaheadfindsea.linksonly", true);
+
+// disable image resizing
+pref("browser.enable_automatic_image_resizing", false);
+
+// enable password manager
+// need to include those prefs since xulrunner doesn't include them
+pref("signon.rememberSignons", true);
+pref("signon.expireMasterPassword", false);
+pref("signon.SignonFileName", "signons.txt");
+
+// use system colours
+pref("browser.display.use_system_colors", true);
+
+// explicitly enable error pages (xulrunner is missing this pref)
+pref("browser.xul.error_pages.enabled", true);
+
+// unset weird xulrunner default UA string
+pref("general.useragent.extra.simple", "");
 
 // disable pings
 pref("browser.send_pings", false);
diff --git a/data/default-prefs-gecko-1-8.js b/data/default-prefs-gecko-1-8.js
deleted file mode 100644
index 3da7687a3..000000000
--- a/data/default-prefs-gecko-1-8.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// use system colours
-pref("browser.display.use_system_colors", true);
-
-// explicitly enable error pages (xulrunner is missing this pref)
-pref("browser.xul.error_pages.enabled", true);
-
-// unset weird xulrunner default UA string
-pref("general.useragent.extra.simple", "");
diff --git a/data/default-prefs-mozilla.js b/data/default-prefs-mozilla.js
deleted file mode 100644
index 53beb85b6..000000000
--- a/data/default-prefs-mozilla.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// enable typeahead find
-pref("accessibility.typeaheadfind", true);
-
-// don't show the stupid wallet master password dialogue
-pref("wallet.caveat", false);
-
diff --git a/data/default-prefs-toolkit.js b/data/default-prefs-toolkit.js
deleted file mode 100644
index f725f3fc1..000000000
--- a/data/default-prefs-toolkit.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// enable plugin finder
-pref("plugin.default_plugin_disabled", true);
-
-// enable locale matching
-pref("intl.locale.matchOS", true);
-
-// enable fixed-up typeaheadfind extension
-pref("accessibility.typeaheadfindsea", false);
-pref("accessibility.typeaheadfindsea.autostart", true);
-pref("accessibility.typeaheadfindsea.linksonly", true);
-
-// disable image resizing
-pref("browser.enable_automatic_image_resizing", false);
-
-// enable password manager
-// need to include those prefs since xulrunner doesn't include them
-pref("signon.rememberSignons", true);
-pref("signon.expireMasterPassword", false);
-pref("signon.SignonFileName", "signons.txt");