[or-cvs] r16086: Make Firefox configuration closer to default (fixes Torbutto (in torbrowser/trunk/build-scripts: . config)
sjm217 at seul.org
sjm217 at seul.org
Sun Jul 20 15:31:57 UTC 2008
Author: sjm217
Date: 2008-07-20 11:31:57 -0400 (Sun, 20 Jul 2008)
New Revision: 16086
Removed:
torbrowser/trunk/build-scripts/config/user.js
Modified:
torbrowser/trunk/build-scripts/Makefile
torbrowser/trunk/build-scripts/config/prefs.js
Log:
Make Firefox configuration closer to default (fixes Torbutton locking problem, and homepage not being displayed)
Modified: torbrowser/trunk/build-scripts/Makefile
===================================================================
--- torbrowser/trunk/build-scripts/Makefile 2008-07-20 15:18:08 UTC (rev 16085)
+++ torbrowser/trunk/build-scripts/Makefile 2008-07-20 15:31:57 UTC (rev 16086)
@@ -183,10 +183,10 @@
configure-apps:
## Configure Firefox preferences
cp $(CONFIG_SRC)/prefs.js $(DEST)/FirefoxPortable/App/DefaultData/profile/
- cp $(CONFIG_SRC)/user.js $(DEST)/FirefoxPortable/App/DefaultData/profile/
cp $(CONFIG_SRC)/bookmarks.html $(DEST)/FirefoxPortable/App/DefaultData/profile/
## Configure FirefoxPortable
cp $(CONFIG_SRC)/FirefoxPortable.ini $(DEST)/FirefoxPortable
+ cp $(CONFIG_SRC)/FirefoxPortableSettings.ini $(DEST)/FirefoxPortable
## Configure PidginPortable
ifeq ($(USE_PIDGIN),1)
cp $(CONFIG_SRC)/PidginPortable.ini $(DEST)/PidginPortable
Modified: torbrowser/trunk/build-scripts/config/prefs.js
===================================================================
--- torbrowser/trunk/build-scripts/config/prefs.js 2008-07-20 15:18:08 UTC (rev 16085)
+++ torbrowser/trunk/build-scripts/config/prefs.js 2008-07-20 15:31:57 UTC (rev 16086)
@@ -11,99 +11,75 @@
user_pref("app.update.auto", false);
user_pref("app.update.enabled", false);
-user_pref("app.update.lastUpdateTime.addon-background-update-timer", 1198168911);
-user_pref("app.update.lastUpdateTime.background-update-timer", 1198168911);
-user_pref("app.update.lastUpdateTime.blocklist-background-update-timer", 1198168911);
-user_pref("app.update.lastUpdateTime.search-engine-update-timer", 1198168911);
+user_pref("app.update.lastUpdateTime.addon-background-update-timer", 1216566538);
+user_pref("app.update.lastUpdateTime.background-update-timer", 1216566535);
+user_pref("app.update.lastUpdateTime.blocklist-background-update-timer", 1216566538);
+user_pref("app.update.lastUpdateTime.search-engine-update-timer", 1216566539);
+user_pref("browser.bookmarks.livemark_refresh_seconds", 31536000);
user_pref("browser.cache.disk.capacity", 0);
user_pref("browser.cache.disk.enable", false);
user_pref("browser.download.manager.retention", 0);
user_pref("browser.download.useDownloadDir", false);
user_pref("browser.formfill.enable", false);
-user_pref("browser.history_expire_days", 0);
user_pref("browser.preferences.advanced.selectedTabIndex", 0);
user_pref("browser.safebrowsing.enabled", false);
user_pref("browser.search.suggest.enabled", false);
user_pref("browser.search.update", false);
user_pref("browser.send_pings", false);
-user_pref("browser.sessionstore.enabled", false);
user_pref("browser.shell.checkDefaultBrowser", false);
user_pref("browser.startup.homepage", "https://check.torproject.org/?lang=BUNDLELOCALE");
user_pref("browser.startup.homepage_override.mstone", "rv:1.8.1.14");
user_pref("dom.storage.enabled", false);
user_pref("extensions.lastAppVersion", "2.0.0.14");
-user_pref("extensions.torbutton.custom.http_port", 8118);
-user_pref("extensions.torbutton.custom.http_proxy", "127.0.0.1");
-user_pref("extensions.torbutton.custom.https_port", 8118);
-user_pref("extensions.torbutton.custom.https_proxy", "127.0.0.1");
-user_pref("extensions.torbutton.custom.socks_host", "localhost");
-user_pref("extensions.torbutton.custom.socks_port", 9050);
+user_pref("extensions.torbutton.fresh_install", false);
user_pref("extensions.torbutton.http_port", 8118);
user_pref("extensions.torbutton.http_proxy", "127.0.0.1");
user_pref("extensions.torbutton.https_port", 8118);
user_pref("extensions.torbutton.https_proxy", "127.0.0.1");
-user_pref("extensions.torbutton.saved.http_port", 8118);
-user_pref("extensions.torbutton.saved.http_proxy", "127.0.0.1");
-user_pref("extensions.torbutton.saved.https_port", 8118);
-user_pref("extensions.torbutton.saved.https_proxy", "127.0.0.1");
+user_pref("extensions.torbutton.locked_mode", true);
+user_pref("extensions.torbutton.proxies_applied", true);
+user_pref("extensions.torbutton.saved.auto_update", false);
user_pref("extensions.torbutton.saved.share_proxy_settings", false);
-user_pref("extensions.torbutton.saved.socks_host", "127.0.0.1");
-user_pref("extensions.torbutton.saved.socks_port", 9050);
-user_pref("extensions.torbutton.saved.socks_remote_dns", true);
user_pref("extensions.torbutton.saved.socks_version", 5);
-user_pref("extensions.torbutton.saved.type", 1);
-user_pref("extensions.torbutton.settings_method", "custom");
-user_pref("extensions.torbutton.socks_host", "localhost");
+user_pref("extensions.torbutton.settings_applied", true);
+user_pref("extensions.torbutton.socks_host", "127.0.0.1");
user_pref("extensions.torbutton.socks_port", 9050);
user_pref("extensions.torbutton.tor_enabled", true);
-user_pref("extensions.torbutton.use_privoxy", false);
+user_pref("extensions.torbutton.tor_memory_jar", true);
user_pref("extensions.update.enabled", false);
user_pref("extensions.update.notifyUser", false);
user_pref("general.appname.override", "Netscape");
user_pref("general.appversion.override", "5.0 (Windows; en-US)");
+user_pref("general.buildID.override", "0");
+user_pref("general.oscpu.override", "Windows NT 5.1");
user_pref("general.platform.override", "Win32");
+user_pref("general.productSub.override", "20080404");
user_pref("general.useragent.locale", "BUNDLELOCALE");
-user_pref("general.useragent.override", "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.12) Gecko/20080201 Firefox/2.0.0.12");
+user_pref("general.useragent.override", "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.14) Gecko/20080404 Firefox/2.0.0.14");
user_pref("general.useragent.vendor", "");
user_pref("general.useragent.vendorSub", "");
user_pref("intl.accept_languages", "en-us, en");
-user_pref("intl.charsetmenu.browser.cache", "ISO-8859-1, UTF-8");
-user_pref("layout.css.report_errors", false);
-user_pref("network.cookie.lifetime.days", 0);
+user_pref("intl.charsetmenu.browser.cache", "UTF-8");
user_pref("network.cookie.lifetimePolicy", 2);
user_pref("network.cookie.prefsMigrated", true);
-user_pref("network.dns.disableIPv6", true);
-user_pref("network.protocol-handler.external-default", false);
-user_pref("network.protocol-handler.external.mailto", false);
-user_pref("network.protocol-handler.external.news", false);
-user_pref("network.protocol-handler.external.nntp", false);
-user_pref("network.protocol-handler.external.snews", false);
user_pref("network.protocol-handler.warn-external.mailto", true);
user_pref("network.protocol-handler.warn-external.news", true);
user_pref("network.protocol-handler.warn-external.nntp", true);
user_pref("network.protocol-handler.warn-external.snews", true);
-user_pref("network.proxy.failover_timeout", 0);
user_pref("network.proxy.http", "127.0.0.1");
user_pref("network.proxy.http_port", 8118);
-user_pref("network.proxy.no_proxies_on", "127.0.0.1");
-user_pref("network.proxy.socks", "localhost");
+user_pref("network.proxy.socks", "127.0.0.1");
user_pref("network.proxy.socks_port", 9050);
user_pref("network.proxy.socks_remote_dns", true);
user_pref("network.proxy.ssl", "127.0.0.1");
user_pref("network.proxy.ssl_port", 8118);
user_pref("network.proxy.type", 1);
user_pref("network.security.ports.banned", "8118,8123,9050,9051");
-user_pref("privacy.item.cookies", true);
-user_pref("privacy.item.passwords", true);
-user_pref("privacy.sanitize.promptOnSanitize", false);
-user_pref("privacy.sanitize.sanitizeOnShutdown", true);
+user_pref("plugin.disable_full_page_plugin_for_types", "application/asx,video/x-ms-asf-plugin,application/x-mplayer2,video/x-ms-asf,video/x-ms-wm,audio/x-ms-wma,audio/x-ms-wax,video/x-ms-wmv,video/x-ms-wvx,application/x-drm-v2,application/x-drm");
user_pref("security.enable_java", false);
-user_pref("security.warn_entering_secure", false);
-user_pref("security.xpconnect.plugin.unrestricted", false);
+user_pref("security.warn_entering_secure.show_once", false);
user_pref("signon.rememberSignons", false);
-user_pref("urlclassifier.tableversion.goog-black-enchash", "1.40619");
-user_pref("urlclassifier.tableversion.goog-black-url", "1.17072");
-user_pref("urlclassifier.tableversion.goog-white-domain", "1.23");
+user_pref("urlclassifier.tableversion.goog-black-enchash", "1.55536");
+user_pref("urlclassifier.tableversion.goog-black-url", "1.23256");
+user_pref("urlclassifier.tableversion.goog-white-domain", "1.481");
user_pref("urlclassifier.tableversion.goog-white-url", "1.371");
-user_pref("xpinstall.whitelist.add", "");
-user_pref("xpinstall.whitelist.add.103", "");
Deleted: torbrowser/trunk/build-scripts/config/user.js
===================================================================
--- torbrowser/trunk/build-scripts/config/user.js 2008-07-20 15:18:08 UTC (rev 16085)
+++ torbrowser/trunk/build-scripts/config/user.js 2008-07-20 15:31:57 UTC (rev 16086)
@@ -1,25 +0,0 @@
-# Mozilla User Preferences
-
-/* Do not edit this file.
- *
- * To make a manual change to preferences, you can visit the URL about:config
- * For more information, see http://www.mozilla.org/unix/customizing.html#prefs
- */
-
-user_pref("browser.sessionstore.enabled", false);
-user_pref("dom.storage.enabled", false);
-user_pref("extensions.torbutton.custom.socks_host", "localhost");
-user_pref("extensions.torbutton.custom.socks_port", 9050);
-user_pref("extensions.torbutton.saved.share_proxy_settings", false);
-user_pref("extensions.torbutton.saved.socks_host", "localhost");
-user_pref("extensions.torbutton.saved.socks_port", 9050);
-user_pref("extensions.torbutton.saved.socks_remote_dns", true);
-user_pref("extensions.torbutton.saved.socks_version", 5);
-user_pref("extensions.torbutton.saved.type", 1);
-user_pref("extensions.torbutton.socks_host", "localhost");
-user_pref("extensions.torbutton.socks_port", 9050);
-user_pref("extensions.torbutton.tor_enabled", true);
-user_pref("extensions.torbutton.use_privoxy", false);
-user_pref("layout.css.report_errors", false);
-user_pref("network.dns.disableIPv6", true);
-user_pref("security.xpconnect.plugin.unrestricted", false);
More information about the tor-commits
mailing list