From 1d0fb998aacfad6d6131251f98dc8ef08a7b08fb Mon Sep 17 00:00:00 2001
From: Sardem FF7 <sardemff7.pub@gmail.com>
Date: Wed, 9 Mar 2011 13:21:36 +0100
Subject: Default prefs cleanup

---
 net-libs/xulrunner/Manifest               |  2 +-
 net-libs/xulrunner/files/default-prefs.js | 20 +++++++++++---------
 www-client/firefox/Manifest               |  2 +-
 www-client/firefox/files/default-prefs.js |  3 +++
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index c7d596f..fcc24eb 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,3 +1,3 @@
-AUX default-prefs.js 709 RMD160 a4d062f75c17552545267ec3fe2f6b54073dafbd SHA1 580128e9edf8021fdbbca2c91abf63cb83bab2c7 SHA256 e6850b0a22f7d3889b49ec4a79a3c4d3d077edd98c8f0ffdc26e30bc70bb4b09
+AUX default-prefs.js 584 RMD160 2fd5ffe5ba46ec3ca7e17c3262f444b383c36e35 SHA1 9d9b838c253b4a136bbde38671e82079ea8d2e4b SHA256 eff68bbd2a1fb9f84d092da1cb765cf95183b57c511938689eed8cf94380c0e5
 AUX gentoo-specific.patch 2957 RMD160 684dc2176769a56c2b1c206b59f999cd44d99c45 SHA1 35ff8e325e45b5384a404a4f99b12fdba9d5e0f3 SHA256 23d981e48a5308dd11ce2fc831071d138d54717bff9cb546dfc5467b0f4204c7
 EBUILD xulrunner-9999.ebuild 2284 RMD160 894538962e60ba815d67536bfc099a02da2888e5 SHA1 d5c25553c27bd54c7d7d7df74ffd5a93bfc3296f SHA256 cb9300a46d7e8675229a73b6493b207aa861d6b73f5d54bb72754a0d27871d3d
diff --git a/net-libs/xulrunner/files/default-prefs.js b/net-libs/xulrunner/files/default-prefs.js
index 9286a6a..a4e2574 100644
--- a/net-libs/xulrunner/files/default-prefs.js
+++ b/net-libs/xulrunner/files/default-prefs.js
@@ -1,14 +1,16 @@
+# The system does the updates
 pref("app.update.enabled",                 false);
 pref("app.update.autoInstallEnabled",      false);
-pref("browser.display.use_system_colors",  true);
-pref("browser.link.open_external",         3);
+
+# Matching the system locale is better
+pref("intl.locale.matchOS", true);
+pref("general.useragent.locale", "chrome://global/locale/intl.properties");
+
+
 pref("general.smoothScroll",               true);
 pref("general.autoScroll",                 false);
-pref("browser.tabs.tabMinWidth",           15);
-pref("browser.backspace_action",           0);
-pref("browser.urlbar.hideGoButton",        true);
 pref("accessibility.typeaheadfind",        true);
-pref("browser.shell.checkDefaultBrowser",  false); 
-pref("browser.EULA.override",              true); 
-pref("intl.locale.matchOS", true);
-pref("general.useragent.locale", "chrome://global/locale/intl.properties");
+
+pref("browser.EULA.override",              true);
+pref("browser.display.use_system_colors",  true);
+pref("browser.link.open_external",         3);
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index c433a17..200fe62 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,4 +1,4 @@
-AUX default-prefs.js 95 RMD160 805cdfec6fb31c224322cb71125547ad7a515f49 SHA1 7fab69d85b12a9f1b0c87fbb1821bdafd7485ac9 SHA256 8bc4cb870bc402db1f20b135a689f8c5dbfa5de8f1755b1926198d627c12c5f1
+AUX default-prefs.js 186 RMD160 a81854c5f1e95d2ce80f48d609dfde038b8fdcd5 SHA1 45ecd4c42affc453359e4aa8f147c0793eb03928 SHA256 a01580ae8f1b9496ee42d94774340a6dfbcbfbc177e258031cdc9d71fcd4985f
 AUX firefox.desktop 306 RMD160 3b24c918e3dd7c6ed935a748271e44894625b6aa SHA1 53f7f45eed895fcb1355609fcc3a994d6a8a7142 SHA256 26e8b5875faed9bde3620d346569af341d36519261fc3c85151f3120b711a51e
 AUX gentoo-specific.patch 3937 RMD160 d167b98c03ff88d955e865aee78203d396620cf7 SHA1 92a372a945734b737ed2d4b534fc8a6ef9e39bbf SHA256 dd6115dcca2972d637f966c6c7faef6d19d8e2622e3c44a0950e98c8f18ec747
 EBUILD firefox-9999.ebuild 1162 RMD160 73140caf6466377616004c216cdaedbec7b9daf0 SHA1 40efde75af4b8738de15e7a9d7ab8a4b1dd85ab3 SHA256 902211063f52b3a5fc3d24ab5ad6673f377387127002a372525e9d14eb62aeff
diff --git a/www-client/firefox/files/default-prefs.js b/www-client/firefox/files/default-prefs.js
index f7c031e..0dec299 100644
--- a/www-client/firefox/files/default-prefs.js
+++ b/www-client/firefox/files/default-prefs.js
@@ -1,2 +1,5 @@
 pref("browser.tabs.tabMinWidth",           15);
 pref("browser.backspace_action",           0);
+
+# Let the system provide the choice UI
+pref("browser.shell.checkDefaultBrowser",  false);
-- 
cgit v1.2.3-65-gdbad