[or-cvs] r16235: Fixed a serious issue in the Firefox config which made it re (in incognito/trunk/root_overlay: etc/init.d var/lib/firefox-config/firefox/o2e6y2eh.default)

anonym at seul.org anonym at seul.org
Tue Jul 29 13:48:26 UTC 2008


Author: anonym
Date: 2008-07-29 09:48:26 -0400 (Tue, 29 Jul 2008)
New Revision: 16235

Modified:
   incognito/trunk/root_overlay/etc/init.d/external-locale
   incognito/trunk/root_overlay/var/lib/firefox-config/firefox/o2e6y2eh.default/prefs.js
Log:
Fixed a serious issue in the Firefox config which made it report the real useragent etc. until Torbutton had been untoggled and toggled back (thanks G. Hoffmann!).
Now Firefox's spell checker dictionary is set accoring to the language chosen in the boot menu.


Modified: incognito/trunk/root_overlay/etc/init.d/external-locale
===================================================================
--- incognito/trunk/root_overlay/etc/init.d/external-locale	2008-07-29 00:34:50 UTC (rev 16234)
+++ incognito/trunk/root_overlay/etc/init.d/external-locale	2008-07-29 13:48:26 UTC (rev 16235)
@@ -24,12 +24,16 @@
 	    # Localize mozilla
 	    MOZILLA_FIVE_HOME="/opt/firefox"
 	    if [[ -w "${MOZILLA_FIVE_HOME}"/defaults/pref/firefox.js ]]; then
-		sed -i "s:general.useragent.locale\", \".*\":general.useragent.locale\", \"${LANGUAGE}\":" \
+		sed -i "s:general.useragent.locale\", \".*\":general.useragent.locale\", \"${LOCALE}\":" \
 		    "${MOZILLA_FIVE_HOME}"/defaults/pref/firefox.js \
 		    "${MOZILLA_FIVE_HOME}"/defaults/pref/firefox-l10n.js 2>/dev/null
+		sed -i "s:spellchecker.dictionary\", \".*\":spellchecker.dictionary\", \"${LOCALE}\":" \
+		    "${MOZILLA_FIVE_HOME}"/defaults/pref/firefox.js \
+		    "${MOZILLA_FIVE_HOME}"/defaults/pref/firefox-l10n.js 2>/dev/null
 	    fi
 	    ls /home/__INCOGNITO_USER__/.mozilla/firefox/*/prefs.js /home/__INCOGNITO_USER__/.thunderbird/*/prefs.js 2>/dev/null | while read PREFS; do
-		echo "user_pref(\"general.useragent.locale\", \"${LANGUAGE}\");" >> "${PREFS}"
+		echo "user_pref(\"general.useragent.locale\", \"${LOCALE}\");" >> "${PREFS}"
+		echo "user_pref(\"spellchecker.dictionary\", \"${LOCALE}\");" >> "${PREFS}"
 	    done
 
 	    # Set keyboard layout in KDE

Modified: incognito/trunk/root_overlay/var/lib/firefox-config/firefox/o2e6y2eh.default/prefs.js
===================================================================
--- incognito/trunk/root_overlay/var/lib/firefox-config/firefox/o2e6y2eh.default/prefs.js	2008-07-29 00:34:50 UTC (rev 16234)
+++ incognito/trunk/root_overlay/var/lib/firefox-config/firefox/o2e6y2eh.default/prefs.js	2008-07-29 13:48:26 UTC (rev 16235)
@@ -20,14 +20,13 @@
 user_pref("privacy.sanitize.promptOnSanitize", false);
 user_pref("privacy.sanitize.sanitizeOnShutdown", true);
 user_pref("browser.preferences.advanced.selectedTabIndex", 0);
-user_pref("browser.search.update", false);
 user_pref("browser.shell.checkDefaultBrowser", false);
 user_pref("browser.startup.homepage", "http://incognito.anonymityanywhere.com");
 user_pref("browser.startup.page", 0);
 
 /* Update the following two versions when upgrading Firefox */
-user_pref("extensions.lastAppVersion", "2.0.0.15");
-user_pref("browser.startup.homepage_override.mstone", "rv:1.8.1.15");
+user_pref("extensions.lastAppVersion", "2.0.0.16");
+user_pref("browser.startup.homepage_override.mstone", "rv:1.8.1.16");
 
 /* Firefox: disable extension updates. */
 user_pref("extensions.update.enabled", false);
@@ -57,7 +56,7 @@
 user_pref("font.name.sans-serif.x-western", "Bitstream Vera Sans");
 user_pref("font.name.serif.x-western", "Bitstream Vera Serif");
 
-/* Torbutton */
+/* Torbutton settings */
 user_pref("extensions.torbutton.custom.http_port", 3128);
 user_pref("extensions.torbutton.custom.http_proxy", "127.0.0.1");
 user_pref("extensions.torbutton.custom.https_port", 3128);
@@ -96,6 +95,33 @@
 user_pref("extensions.torbutton.tor_memory_jar", true);
 user_pref("extensions.torbutton.use_privoxy", false);
 
+/* Additional Firefox state due to Torbutton being toggled */
+user_pref("browser.cache.disk.enable", false);
+user_pref("browser.download.manager.retention", 0);
+user_pref("browser.formfill.enable", false);
+user_pref("browser.safebrowsing.enabled", false);
+user_pref("browser.send_pings", false);
+user_pref("dom.storage.enabled", 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.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("network.cookie.lifetimePolicy", 2);
+user_pref("network.protocol-handler.warn-external.file", true);
+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.security.ports.banned", "8118,8123,9050,9051");
+user_pref("plugin.disable_full_page_plugin_for_types", "application/x-shockwave-flash,application/futuresplash,video/divx,video/vnd.divx,video/quicktime,video/x-quicktime,image/x-quicktime,video/quicktime,video/quicktime,application/x-quicktimeplayer,application/smil,audio/x-pn-realaudio,application/vnd.rn-realmedia,application/vnd.rn-realaudio,video/vnd.rn-realvideo,audio/x-realaudio,audio/x-pn-realaudio-plugin,application/smil,application/asx,video/x-ms-asf-plugin,video/x-msvideo,video/msvideo,application/x-mplayer2,application/x-ms-wmv,video/x-ms-asf,video/x-ms-wm,video/x-ms-wmv,audio/x-ms-wmv,video/x-ms-wmp,application/x-ms-wmp,video/x-ms-wvx,audio/x-ms-wax,audio/x-ms-wma,application/x-drm-v2,audio/wav,audio/x-wav,video/mpeg,audio/mpeg,video/x-mpeg,video/x-mpeg2,audio/mpeg,audio/x-mpeg,audio/mpeg2,audio/x-mpeg2,video/mp4,video/3gpp,audio/mpeg3,audio/x-mpeg3,audio/x-mpegurl,audio/mp3,application/x-ogg,audio/ogg,audio/x-ogg,application/ogg,audio/flac,audio/x-flac,video/fli,video/x-fli,video/x-flv,video/vnd.vivo,application/x-nsv-vp3-mp3,audio/x-mod,audio/basic,audio/x-basic");
+user_pref("security.enable_java", false);
+
 /* AdBlock Plus */
 user_pref("extensions.adblockplus.checkedadblockinstalled", true);
 user_pref("extensions.adblockplus.showinstatusbar", false);
@@ -119,4 +145,9 @@
 user_pref("browser.search.useDBForOrder", true);
 
 /* Quick Locale Switcher */
+user_pref("extensions.qls.autoswitchfortld", false);
+user_pref("extensions.qls.backup_acceptlanguages", "en-us, en");
+user_pref("extensions.qls.switch_accept_languages", false);
+user_pref("extensions.qls.switch_gulocale", true);
+user_pref("extensions.qls.useautoswitch", false);
 user_pref("extensions.qls.visiblemenuitems", "ar-EG#zh-CN#zh-TW#nl-NL#en-GB#en-US#fr-FR#de-DE#el-GR#he-IL#it-IT#ja-JP#fa-IR#pt-PT#ru-RU#es-ES#sv-SE");



More information about the tor-commits mailing list