[or-cvs] [torbutton/master] Fix 2491: Clean up checks for when to jar cookies.

[mikeperry@xxxxxxxxxxxxxx]

commit 31c590f98fc6db77a81ff8704a62fd50cf9b1f5d
Author: Mike Perry <mikeperry-git@xxxxxxxxxx>
Date:   Sat Feb 12 07:35:27 2011 -0800

    Fix 2491: Clean up checks for when to jar cookies.
---
 src/chrome/content/torbutton.js |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 3f6151b..3d4d0dc 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -1844,20 +1844,17 @@ function torbutton_jar_cookies(mode) {
         return;
     }*/
     var protectcookies = m_tb_prefs.getBoolPref('extensions.torbutton.cookie_protections');
-    var writeTor = !m_tb_prefs.getBoolPref('extensions.torbutton.tor_memory_jar');
-    var writeNontor = !m_tb_prefs.getBoolPref('extensions.torbutton.nontor_memory_jar');
     if(mode) {
-        if (protectcookies && writeNontor)
+        if (protectcookies)
           selector.clearUnprotectedCookies("nontor");        
-        if (writeNontor)
-          selector.saveCookies("nontor");
+        selector.saveCookies("nontor");
         selector.clearCookies();
         if(m_tb_prefs.getBoolPref('extensions.torbutton.dual_cookie_jars'))
             selector.loadCookies("tor", false);
     } else {
-        if (protectcookies && writeTor)
+        if (protectcookies)
           selector.clearUnprotectedCookies("tor");          
-        if(m_tb_prefs.getBoolPref('extensions.torbutton.dual_cookie_jars') && writeTor)
+        if(m_tb_prefs.getBoolPref('extensions.torbutton.dual_cookie_jars'))
             selector.saveCookies("tor");
         selector.clearCookies();
         selector.loadCookies("nontor", false);