[or-cvs] r13538: Spoof locale if user wanted to spoof english browser. Also i (in torbutton/trunk/src: . chrome/content chrome/locale/de-AT chrome/locale/de-CH chrome/locale/de-DE chrome/locale/el-GR chrome/locale/en-US chrome/locale/es-AR chrome/locale/fr-FR chrome/locale/hr-HR chrome/locale/it-IT chrome/locale/nl-NL chrome/locale/pl-PL chrome/locale/pt-BR chrome/locale/ru-RU chrome/locale/sl-SI chrome/locale/zh-CN chrome/locale/zh-TW defaults/preferences)

mikeperry at seul.org mikeperry at seul.org
Sun Feb 17 06:55:36 UTC 2008


Author: mikeperry
Date: 2008-02-17 01:55:35 -0500 (Sun, 17 Feb 2008)
New Revision: 13538

Modified:
   torbutton/trunk/src/chrome/content/jshooks.js
   torbutton/trunk/src/chrome/content/preferences.js
   torbutton/trunk/src/chrome/content/preferences.xul
   torbutton/trunk/src/chrome/content/torbutton.js
   torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd
   torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd
   torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd
   torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd
   torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd
   torbutton/trunk/src/chrome/locale/es-AR/torbutton.dtd
   torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd
   torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd
   torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd
   torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd
   torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd
   torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd
   torbutton/trunk/src/chrome/locale/ru-RU/torbutton.dtd
   torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd
   torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd
   torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd
   torbutton/trunk/src/defaults/preferences/preferences.js
   torbutton/trunk/src/install.rdf
Log:

Spoof locale if user wanted to spoof english browser. Also
implement window and desktop size obfuscation by lying about
window.screen.* attributes and resizing windows to multiples
of 50px in each dimension. Hopefully this won't be *too*
annoying.



Modified: torbutton/trunk/src/chrome/content/jshooks.js
===================================================================
--- torbutton/trunk/src/chrome/content/jshooks.js	2008-02-16 23:40:18 UTC (rev 13537)
+++ torbutton/trunk/src/chrome/content/jshooks.js	2008-02-17 06:55:35 UTC (rev 13538)
@@ -19,6 +19,40 @@
       /*navigator.__defineGetter__("platform", function() { return tmp_platform;});*/
   }
 
+  // No pref for this.. Should be mostly harmless..
+  if(true) {
+      window.__defineGetter__("outerWidth", function() { return window.innerWidth;});
+      window.__defineGetter__("outerHeight", function() { return window.innerHeight;});
+      window.__defineGetter__("screenX", function() { return 0;});
+      window.__defineGetter__("screenY", function() { return 0;});
+      window.__defineGetter__("pageXOffset", function() { return 0;});
+      window.__defineGetter__("pageYOffset", function() { return 0;});
+
+      // We can't define individual getters/setters for window.screen 
+      // for some reason. works in html but not in these hooks.. No idea why
+      var scr = new Object();
+      var origScr = window.screen;
+      scr.__defineGetter__("height", function() { return window.innerHeight; });
+      scr.__defineGetter__("width", function() { return window.innerWidth; });
+
+      scr.__defineGetter__("availTop", function() { return 0;});
+      scr.__defineGetter__("availLeft", function() { return 0;});
+
+      scr.__defineGetter__("top", function() { return 0;});
+      scr.__defineGetter__("left", function() { return 0;});
+
+      scr.__defineGetter__("availHeight", function() { return window.innerHeight;});
+      scr.__defineGetter__("availWidth", function() { return window.innerWidth;});
+
+      scr.__defineGetter__("colorDepth", function() { return origScr.colorDepth;});
+      scr.__defineGetter__("pixelDepth", function() { return origScr.pixelDepth;});
+
+      scr.__defineGetter__("availTop", function() { return 0;});
+      scr.__defineGetter__("availLeft", function() { return 0;});
+
+      window.__defineGetter__("screen", function() { return scr; });
+  }
+
   /* Timezone fix for http://gemal.dk/browserspy/css.html */
   var reparseDate = function(d, str) {
     /* Rules:
@@ -183,6 +217,7 @@
 
 if (typeof(window.__HookObjects) != "undefined") {
     var res = 23;
+
     if(!window.__HookObjects()) {
         res = 13;
     }

Modified: torbutton/trunk/src/chrome/content/preferences.js
===================================================================
--- torbutton/trunk/src/chrome/content/preferences.js	2008-02-16 23:40:18 UTC (rev 13537)
+++ torbutton/trunk/src/chrome/content/preferences.js	2008-02-17 06:55:35 UTC (rev 13538)
@@ -134,6 +134,7 @@
     doc.getElementById('torbutton_disablePlugins').checked = o_torprefs.getBoolPref('no_tor_plugins');
     doc.getElementById('torbutton_clearHistory').checked = o_torprefs.getBoolPref('clear_history');
     doc.getElementById('torbutton_killBadJS').checked = o_torprefs.getBoolPref('kill_bad_js');
+    doc.getElementById('torbutton_resizeOnToggle').checked = o_torprefs.getBoolPref('resize_on_toggle');
     
     if(o_torprefs.getBoolPref('clear_cache')) {
         doc.getElementById('torbutton_cacheGroup').selectedItem =
@@ -252,6 +253,7 @@
     o_torprefs.setBoolPref('no_tor_plugins', doc.getElementById('torbutton_disablePlugins').checked);
     o_torprefs.setBoolPref('clear_history', doc.getElementById('torbutton_clearHistory').checked);
     o_torprefs.setBoolPref('kill_bad_js', doc.getElementById('torbutton_killBadJS').checked);
+    o_torprefs.setBoolPref('resize_on_toggle', doc.getElementById('torbutton_resizeOnToggle').checked);
     o_torprefs.setBoolPref('isolate_content', doc.getElementById('torbutton_isolateContent').checked);
 
     o_torprefs.setBoolPref('clear_cache', doc.getElementById('torbutton_clearCache').selected);

Modified: torbutton/trunk/src/chrome/content/preferences.xul
===================================================================
--- torbutton/trunk/src/chrome/content/preferences.xul	2008-02-16 23:40:18 UTC (rev 13537)
+++ torbutton/trunk/src/chrome/content/preferences.xul	2008-02-17 06:55:35 UTC (rev 13538)
@@ -133,6 +133,8 @@
                   oncommand="torbutton_prefs_set_field_attributes(document)"/>
         <checkbox id="torbutton_killBadJS" label="&torbutton.prefs.kill_bad_js;" 
                   oncommand="torbutton_prefs_set_field_attributes(document)"/>
+        <checkbox id="torbutton_resizeOnToggle" label="&torbutton.prefs.resize_on_toggle;" 
+                  oncommand="torbutton_prefs_set_field_attributes(document)"/>
         <checkbox id="torbutton_noUpdates" label="&torbutton.prefs.no_updates;" 
                   oncommand="torbutton_prefs_set_field_attributes(document)"/>
         <checkbox id="torbutton_noSearch" label="&torbutton.prefs.no_search;" 

Modified: torbutton/trunk/src/chrome/content/torbutton.js
===================================================================
--- torbutton/trunk/src/chrome/content/torbutton.js	2008-02-16 23:40:18 UTC (rev 13537)
+++ torbutton/trunk/src/chrome/content/torbutton.js	2008-02-17 06:55:35 UTC (rev 13538)
@@ -93,6 +93,7 @@
                 torbutton_set_status();
                 break;
 
+            case "extensions.torbutton.dual_cookie_jars":
             case "extensions.torbutton.cookie_jars":
             case "extensions.torbutton.clear_cookies":
                 if(!m_tb_prefs.getBoolPref("extensions.torbutton.cookie_jars")
@@ -144,6 +145,7 @@
             case "extensions.torbutton.block_thwrite":
             case "extensions.torbutton.shutdown_method":
             case "extensions.torbutton.spoof_english":
+            case "extensions.torbutton.resize_on_toggle":
                 torbutton_log(1, "Got update message, updating status");
                 torbutton_update_status(
                         m_tb_prefs.getBoolPref("extensions.torbutton.tor_enabled"),
@@ -590,12 +592,16 @@
     }
 
     if(torprefs.getBoolPref("spoof_english") && mode) {
+        m_tb_prefs.setCharPref("general.useragent.locale", 
+                torprefs.getCharPref("spoof_locale"));
         m_tb_prefs.setCharPref("intl.accept_charsets", 
                 torprefs.getCharPref("spoof_charset"));
         m_tb_prefs.setCharPref("intl.accept_languages",
                 torprefs.getCharPref("spoof_language"));
     } else {
         try {
+            if(m_tb_prefs.prefHasUserValue("general.useragent.locale"))
+                m_tb_prefs.clearUserPref("general.useragent.locale");
             if(m_tb_prefs.prefHasUserValue("intl.accept_charsets"))
                 m_tb_prefs.clearUserPref("intl.accept_charsets");
             if(m_tb_prefs.prefHasUserValue("intl.accept_languages"))
@@ -703,8 +709,23 @@
         }
     }
 
+    torbutton_log(2, "Prefs pretty much done");
     
-    torbutton_log(2, "Prefs pretty much done");
+    // If the window is not maximized (sizemode)
+    if(mode && torprefs.getBoolPref("resize_on_toggle")) {
+        var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
+            .getService(Components.interfaces.nsIWindowMediator);
+        var enumerator = wm.getEnumerator("navigator:browser");
+        while(enumerator.hasMoreElements()) {
+            var win = enumerator.getNext();
+            if(win.windowState 
+                    == Components.interfaces.nsIDOMChromeWindow.STATE_NORMAL) {
+                var bWin = win.getBrowser().contentWindow;
+                bWin.innerHeight = Math.round(bWin.innerHeight/50.0)*50;
+                bWin.innerWidth = Math.round(bWin.innerWidth/50.0)*50;
+            }
+        }
+    }
 
     // No need to clear cookies if just updating prefs
     if(!changed && force_update)

Modified: torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd	2008-02-16 23:40:18 UTC (rev 13537)
+++ torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd	2008-02-17 06:55:35 UTC (rev 13538)
@@ -68,3 +68,4 @@
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">
 <!ENTITY torbutton.prefs.block_js_history       "Block javascript access to history navigation (recommended)">
+<!ENTITY torbutton.prefs.resize_on_toggle       "Resize window dimensions to multiples of 40px on toggle (recommended)">

Modified: torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd	2008-02-16 23:40:18 UTC (rev 13537)
+++ torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd	2008-02-17 06:55:35 UTC (rev 13538)
@@ -68,3 +68,4 @@
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">
 <!ENTITY torbutton.prefs.block_js_history       "Block javascript access to history navigation (recommended)">
+<!ENTITY torbutton.prefs.resize_on_toggle       "Resize window dimensions to multiples of 40px on toggle (recommended)">

Modified: torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd	2008-02-16 23:40:18 UTC (rev 13537)
+++ torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd	2008-02-17 06:55:35 UTC (rev 13538)
@@ -68,3 +68,4 @@
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">
 <!ENTITY torbutton.prefs.block_js_history       "Block javascript access to history navigation (recommended)">
+<!ENTITY torbutton.prefs.resize_on_toggle       "Resize window dimensions to multiples of 40px on toggle (recommended)">

Modified: torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd	2008-02-16 23:40:18 UTC (rev 13537)
+++ torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd	2008-02-17 06:55:35 UTC (rev 13538)
@@ -68,3 +68,4 @@
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">
 <!ENTITY torbutton.prefs.block_js_history       "Block javascript access to history navigation (recommended)">
+<!ENTITY torbutton.prefs.resize_on_toggle       "Resize window dimensions to multiples of 40px on toggle (recommended)">

Modified: torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd	2008-02-16 23:40:18 UTC (rev 13537)
+++ torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd	2008-02-17 06:55:35 UTC (rev 13538)
@@ -68,3 +68,4 @@
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">
 <!ENTITY torbutton.prefs.block_js_history       "Block javascript access to history navigation (recommended)">
+<!ENTITY torbutton.prefs.resize_on_toggle       "Resize window dimensions to multiples of 50px on toggle (recommended)">

Modified: torbutton/trunk/src/chrome/locale/es-AR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/es-AR/torbutton.dtd	2008-02-16 23:40:18 UTC (rev 13537)
+++ torbutton/trunk/src/chrome/locale/es-AR/torbutton.dtd	2008-02-17 06:55:35 UTC (rev 13538)
@@ -68,3 +68,4 @@
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">
 <!ENTITY torbutton.prefs.block_js_history       "Block javascript access to history navigation (recommended)">
+<!ENTITY torbutton.prefs.resize_on_toggle       "Resize window dimensions to multiples of 40px on toggle (recommended)">

Modified: torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd	2008-02-16 23:40:18 UTC (rev 13537)
+++ torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd	2008-02-17 06:55:35 UTC (rev 13538)
@@ -68,3 +68,4 @@
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">
 <!ENTITY torbutton.prefs.block_js_history       "Block javascript access to history navigation (recommended)">
+<!ENTITY torbutton.prefs.resize_on_toggle       "Resize window dimensions to multiples of 40px on toggle (recommended)">

Modified: torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd	2008-02-16 23:40:18 UTC (rev 13537)
+++ torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd	2008-02-17 06:55:35 UTC (rev 13538)
@@ -68,3 +68,4 @@
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">
 <!ENTITY torbutton.prefs.block_js_history       "Block javascript access to history navigation (recommended)">
+<!ENTITY torbutton.prefs.resize_on_toggle       "Resize window dimensions to multiples of 40px on toggle (recommended)">

Modified: torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd	2008-02-16 23:40:18 UTC (rev 13537)
+++ torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd	2008-02-17 06:55:35 UTC (rev 13538)
@@ -68,3 +68,4 @@
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">
 <!ENTITY torbutton.prefs.block_js_history       "Block javascript access to history navigation (recommended)">
+<!ENTITY torbutton.prefs.resize_on_toggle       "Resize window dimensions to multiples of 40px on toggle (recommended)">

Modified: torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd	2008-02-16 23:40:18 UTC (rev 13537)
+++ torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd	2008-02-17 06:55:35 UTC (rev 13538)
@@ -68,3 +68,4 @@
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">
 <!ENTITY torbutton.prefs.block_js_history       "Block javascript access to history navigation (recommended)">
+<!ENTITY torbutton.prefs.resize_on_toggle       "Resize window dimensions to multiples of 40px on toggle (recommended)">

Modified: torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd	2008-02-16 23:40:18 UTC (rev 13537)
+++ torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd	2008-02-17 06:55:35 UTC (rev 13538)
@@ -68,3 +68,4 @@
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">
 <!ENTITY torbutton.prefs.block_js_history       "Block javascript access to history navigation (recommended)">
+<!ENTITY torbutton.prefs.resize_on_toggle       "Resize window dimensions to multiples of 40px on toggle (recommended)">

Modified: torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd	2008-02-16 23:40:18 UTC (rev 13537)
+++ torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd	2008-02-17 06:55:35 UTC (rev 13538)
@@ -68,3 +68,4 @@
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">
 <!ENTITY torbutton.prefs.block_js_history       "Block javascript access to history navigation (recommended)">
+<!ENTITY torbutton.prefs.resize_on_toggle       "Resize window dimensions to multiples of 40px on toggle (recommended)">

Modified: torbutton/trunk/src/chrome/locale/ru-RU/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/ru-RU/torbutton.dtd	2008-02-16 23:40:18 UTC (rev 13537)
+++ torbutton/trunk/src/chrome/locale/ru-RU/torbutton.dtd	2008-02-17 06:55:35 UTC (rev 13538)
@@ -68,3 +68,4 @@
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">
 <!ENTITY torbutton.prefs.block_js_history       "Block javascript access to history navigation (recommended)">
+<!ENTITY torbutton.prefs.resize_on_toggle       "Resize window dimensions to multiples of 40px on toggle (recommended)">

Modified: torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd	2008-02-16 23:40:18 UTC (rev 13537)
+++ torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd	2008-02-17 06:55:35 UTC (rev 13538)
@@ -68,3 +68,4 @@
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">
 <!ENTITY torbutton.prefs.block_js_history       "Block javascript access to history navigation (recommended)">
+<!ENTITY torbutton.prefs.resize_on_toggle       "Resize window dimensions to multiples of 40px on toggle (recommended)">

Modified: torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd	2008-02-16 23:40:18 UTC (rev 13537)
+++ torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd	2008-02-17 06:55:35 UTC (rev 13538)
@@ -68,3 +68,4 @@
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">
 <!ENTITY torbutton.prefs.block_js_history       "Block javascript access to history navigation (recommended)">
+<!ENTITY torbutton.prefs.resize_on_toggle       "Resize window dimensions to multiples of 40px on toggle (recommended)">

Modified: torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd	2008-02-16 23:40:18 UTC (rev 13537)
+++ torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd	2008-02-17 06:55:35 UTC (rev 13538)
@@ -68,3 +68,4 @@
 <!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
 <!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">
 <!ENTITY torbutton.prefs.block_js_history       "Block javascript access to history navigation (recommended)">
+<!ENTITY torbutton.prefs.resize_on_toggle       "Resize window dimensions to multiples of 40px on toggle (recommended)">

Modified: torbutton/trunk/src/defaults/preferences/preferences.js
===================================================================
--- torbutton/trunk/src/defaults/preferences/preferences.js	2008-02-16 23:40:18 UTC (rev 13537)
+++ torbutton/trunk/src/defaults/preferences/preferences.js	2008-02-17 06:55:35 UTC (rev 13538)
@@ -66,6 +66,7 @@
 pref("extensions.torbutton.spoof_english",true);
 pref("extensions.torbutton.spoof_charset",'iso-8859-1,*,utf-8');
 pref("extensions.torbutton.spoof_language",'en-us, en');
+pref("extensions.torbutton.spoof_locale",'en-US');
 pref("extensions.torbutton.disable_referer",false);
 pref("extensions.torbutton.shutdown_method",1); // 0=none, 1=tor, 2=all
 pref("extensions.torbutton.block_tforms",true);
@@ -75,7 +76,7 @@
 pref("extensions.torbutton.clear_http_auth",true);
 pref("extensions.torbutton.close_on_toggle",false);
 pref("extensions.torbutton.block_js_history",true);
-
+pref("extensions.torbutton.resize_on_toggle",true);
 pref("extensions.torbutton.appname_override","Netscape");
 pref("extensions.torbutton.appversion_override","5.0 (Windows; en-US)");
 pref("extensions.torbutton.platform_override","Win32");

Modified: torbutton/trunk/src/install.rdf
===================================================================
--- torbutton/trunk/src/install.rdf	2008-02-16 23:40:18 UTC (rev 13537)
+++ torbutton/trunk/src/install.rdf	2008-02-17 06:55:35 UTC (rev 13538)
@@ -6,7 +6,7 @@
         <em:name>Torbutton</em:name>
         <em:creator>Scott Squires &amp; Mike Perry</em:creator>
         <em:id>{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}</em:id>
-        <em:version>1.1.13-alpha</em:version>
+        <em:version>1.1.13-alpha-dev</em:version>
         <em:homepageURL>https://torbutton.torproject.org/dev/</em:homepageURL>
         <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>
         <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>



More information about the tor-commits mailing list