[or-cvs] r14593: Don't bother to ask the user if we should try to isolate CA (torbutton/trunk/src/chrome/content)

[mikeperry at seul.org]

Author: mikeperry
Date: 2008-05-12 04:26:02 -0400 (Mon, 12 May 2008)
New Revision: 14593

Modified:
   torbutton/trunk/src/chrome/content/torbutton.js
Log:

Don't bother to ask the user if we should try to isolate CA
certs even though they have none. Just set the pref to
disable it after the first toggle.



Modified: torbutton/trunk/src/chrome/content/torbutton.js
===================================================================
--- torbutton/trunk/src/chrome/content/torbutton.js	2008-05-12 08:11:45 UTC (rev 14592)
+++ torbutton/trunk/src/chrome/content/torbutton.js	2008-05-12 08:26:02 UTC (rev 14593)
@@ -1211,6 +1211,7 @@
     if(m_tb_prefs.getBoolPref("extensions.torbutton.jar_ca_certs")) {
         if(torbutton_unjar_cert_type(mode, caTreeView, "ca", 
                 Components.interfaces.nsIX509Cert.CA_CERT) == 0) {
+            /*
             if(!m_tb_prefs.getBoolPref("extensions.torbutton.asked_ca_disable")) {
                 var o_stringbundle = torbutton_get_stringbundle();
                 var warning = o_stringbundle.GetStringFromName("torbutton.popup.confirm_ca_certs");
@@ -1220,8 +1221,12 @@
                     m_tb_prefs.setBoolPref("extensions.torbutton.jar_ca_certs",
                             false);
                 }
-                m_tb_prefs.setBoolPref("extensions.torbutton.asked_ca_disable", true);
-            }
+                m_tb_prefs.setBoolPref("extensions.torbutton.asked_ca_disable", 
+                        true);
+            }*/
+            // arma thinks this not worth even asking. He is probably right.
+            m_tb_prefs.setBoolPref("extensions.torbutton.jar_ca_certs",
+                    false);
         }
     }
     torbutton_unjar_cert_type(mode, userTreeView, "user",