[or-cvs] r14658: Fix issue with updating cookie.lifetimePolicy properly on pr (torbutton/trunk/src/chrome/content)

[mikeperry at seul.org]

Author: mikeperry
Date: 2008-05-17 21:56:32 -0400 (Sat, 17 May 2008)
New Revision: 14658

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

Fix issue with updating cookie.lifetimePolicy properly on
pref change.



Modified: torbutton/trunk/src/chrome/content/torbutton.js
===================================================================
--- torbutton/trunk/src/chrome/content/torbutton.js	2008-05-18 01:38:11 UTC (rev 14657)
+++ torbutton/trunk/src/chrome/content/torbutton.js	2008-05-18 01:56:32 UTC (rev 14658)
@@ -97,10 +97,15 @@
             case "extensions.torbutton.dual_cookie_jars":
             case "extensions.torbutton.cookie_jars":
             case "extensions.torbutton.clear_cookies":
+                torbutton_log(2, "Got cookie pref change");
                 if(!m_tb_prefs.getBoolPref("extensions.torbutton.cookie_jars")
                     && !m_tb_prefs.getBoolPref("extensions.torbutton.clear_cookies")) {
+                    torbutton_log(3, "Changing lifetime");
                     m_tb_prefs.setIntPref("network.cookie.lifetimePolicy",
-                            torprefs.getIntPref("saved.cookieLifetime")); 
+                            m_tb_prefs.getIntPref("extensions.torbutton.saved.cookieLifetime")); 
+                } else if(m_tb_prefs.getBoolPref("extensions.torbutton.tor_enabled")) {
+                    torbutton_log(3, "Changing lifetime");
+                    m_tb_prefs.setIntPref("network.cookie.lifetimePolicy", 2); 
                 }
                 break;