[or-cvs] r10651: Fix to allow users to manually manage cookies. (in torbutton/trunk/src/chrome: content locale/en-US)

[mikeperry at seul.org]

Author: mikeperry
Date: 2007-06-19 01:46:06 -0400 (Tue, 19 Jun 2007)
New Revision: 10651

Modified:
   torbutton/trunk/src/chrome/content/preferences.js
   torbutton/trunk/src/chrome/content/preferences.xul
   torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd
Log:
Fix to allow users to manually manage cookies.



Modified: torbutton/trunk/src/chrome/content/preferences.js
===================================================================
--- torbutton/trunk/src/chrome/content/preferences.js	2007-06-19 04:03:48 UTC (rev 10650)
+++ torbutton/trunk/src/chrome/content/preferences.js	2007-06-19 05:46:06 UTC (rev 10651)
@@ -148,11 +148,16 @@
         doc.getElementById('torbutton_cookieGroup').selectedItem = 
             doc.getElementById('torbutton_clearCookies');
         o_torprefs.setBoolPref('cookie_jars', false);
-    } else {
+    } else if(o_torprefs.getBoolPref('cookie_jars')) {
         doc.getElementById('torbutton_cookieGroup').selectedItem =
             doc.getElementById('torbutton_cookieJars');
         o_torprefs.setBoolPref('cookie_jars', true);
         o_torprefs.setBoolPref('clear_cookies', false); 
+    } else {
+        doc.getElementById('torbutton_cookieGroup').selectedItem =
+            doc.getElementById('torbutton_mmmCookies');
+        o_torprefs.setBoolPref('cookie_jars', false);
+        o_torprefs.setBoolPref('clear_cookies', false); 
     }
 
     doc.getElementById('torbutton_blockTorHRead').checked = o_torprefs.getBoolPref('block_thread');

Modified: torbutton/trunk/src/chrome/content/preferences.xul
===================================================================
--- torbutton/trunk/src/chrome/content/preferences.xul	2007-06-19 04:03:48 UTC (rev 10650)
+++ torbutton/trunk/src/chrome/content/preferences.xul	2007-06-19 05:46:06 UTC (rev 10651)
@@ -140,10 +140,13 @@
             <radiogroup id="torbutton_cookieGroup">
              <radio id="torbutton_clearCookies"
                     label="&torbutton.prefs.clear_cookies;" 
-                    oncommand="torbutton_prefs_set_field_attributes(document)"/>             <radio id="torbutton_cookieJars"
+                    oncommand="torbutton_prefs_set_field_attributes(document)"/>             
+			<radio id="torbutton_cookieJars"
                     label="&torbutton.prefs.cookie_jars;" 
                     oncommand="torbutton_prefs_set_field_attributes(document)"/>
-             </radiogroup>
+   			<radio id="torbutton_mmmCookies"
+                    label="&torbutton.prefs.mmm_cookies;" 
+                    oncommand="torbutton_prefs_set_field_attributes(document)"/>          </radiogroup>
            </vbox>
           </tabpanel>
           <tabpanel id="cache">

Modified: torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd	2007-06-19 04:03:48 UTC (rev 10650)
+++ torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd	2007-06-19 05:46:06 UTC (rev 10651)
@@ -23,6 +23,7 @@
 <!ENTITY torbutton.prefs.clear_cache        "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache        "Block disk and memory cache access during Tor">
 <!ENTITY torbutton.prefs.cookie_jars        "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.mmm_cookies        "I will manually manage my cookies (dangerous)">
 <!ENTITY torbutton.prefs.clear_cookies      "Clear cookies on Tor toggle">
 <!ENTITY torbutton.prefs.disable_plugins    "Disable plugins during Tor usage (recommended)">
 <!ENTITY torbutton.prefs.kill_bad_js        "Block dangerous javascript (recommended)">