[or-cvs] r19063: {torbutton} More changes for Bug 909: if you change it to "I close firef (torbutton/trunk/src/chrome/content)

[mikeperry at seul.org]

Author: mikeperry
Date: 2009-03-16 22:40:23 -0400 (Mon, 16 Mar 2009)
New Revision: 19063

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

More changes for Bug 909: if you change it to "I close
firefox" during Non-Tor, then both write-to-disk cookie
settings should get disabled.. But if you change it during
Tor usage, it only affects the Tor-side cookie prefs...



Modified: torbutton/trunk/src/chrome/content/torbutton.js
===================================================================
--- torbutton/trunk/src/chrome/content/torbutton.js	2009-03-17 02:01:43 UTC (rev 19062)
+++ torbutton/trunk/src/chrome/content/torbutton.js	2009-03-17 02:40:23 UTC (rev 19063)
@@ -118,9 +118,11 @@
                             m_tb_prefs.setBoolPref('extensions.torbutton.tor_memory_jar', false);
                         if(m_tb_prefs.getBoolPref('extensions.torbutton.nontor_memory_jar'))
                             m_tb_prefs.setBoolPref('extensions.torbutton.nontor_memory_jar', false);
-                    } else if(lp == 2 && 
-                            !m_tb_prefs.getBoolPref("extensions.torbutton.nontor_memory_jar")) {
-                        m_tb_prefs.setBoolPref("extensions.torbutton.nontor_memory_jar", true);
+                    } else if(lp == 2) {
+                        if(!m_tb_prefs.getBoolPref("extensions.torbutton.nontor_memory_jar"))
+                             m_tb_prefs.setBoolPref("extensions.torbutton.nontor_memory_jar", true);
+                        if(!m_tb_prefs.getBoolPref("extensions.torbutton.tor_memory_jar"))
+                             m_tb_prefs.setBoolPref("extensions.torbutton.tor_memory_jar", true);
                     }
                 } else {
                     if(lp == 0) { // The cookie's lifetime is supplied by the server.