[or-cvs] r11705: Bump version down to 1.1.7-alpha-dev to conform to version-s (in torbutton/trunk/src: . chrome/content)

[mikeperry at seul.org]

Author: mikeperry
Date: 2007-09-29 00:38:27 -0400 (Sat, 29 Sep 2007)
New Revision: 11705

Modified:
   torbutton/trunk/src/chrome/content/preferences.js
   torbutton/trunk/src/chrome/content/torbutton.js
   torbutton/trunk/src/install.rdf
Log:

Bump version down to 1.1.7-alpha-dev to conform to
version-spec. Also make sure to clear our cookie jars if the
user wants us to clear cookies at exit.



Modified: torbutton/trunk/src/chrome/content/preferences.js
===================================================================
--- torbutton/trunk/src/chrome/content/preferences.js	2007-09-29 03:24:18 UTC (rev 11704)
+++ torbutton/trunk/src/chrome/content/preferences.js	2007-09-29 04:38:27 UTC (rev 11705)
@@ -264,7 +264,8 @@
 
     /* Reset the shutdown option if the user wants to manage own cookies */
     if(!o_torprefs.getBoolPref('cookie_jars') 
-            && !o_torprefs.getBoolPref('clear_cookies')) {
+            && !o_torprefs.getBoolPref('clear_cookies')
+            && !o_torprefs.getBoolPref('dual_cookie_jars')) {
         o_torprefs.setIntPref('shutdown_method', 0); 
         doc.getElementById('torbutton_shutdownGroup').selectedItem
             = doc.getElementById('torbutton_noShutdown');

Modified: torbutton/trunk/src/chrome/content/torbutton.js
===================================================================
--- torbutton/trunk/src/chrome/content/torbutton.js	2007-09-29 03:24:18 UTC (rev 11704)
+++ torbutton/trunk/src/chrome/content/torbutton.js	2007-09-29 04:38:27 UTC (rev 11705)
@@ -881,8 +881,20 @@
     if((m_tb_prefs.getIntPref("extensions.torbutton.shutdown_method") == 1 && 
         m_tb_prefs.getBoolPref("extensions.torbutton.tor_enabled"))
         || m_tb_prefs.getIntPref("extensions.torbutton.shutdown_method") == 2) {
-        torbutton_clear_cookies();
-    } 
+        var selector =
+            Components.classes["@stanford.edu/cookie-jar-selector;1"]
+            .getService(Components.interfaces.nsISupports)
+            .wrappedJSObject;
+        selector.clearCookies();
+        // clear the cookie jar by saving the empty cookies to it.
+        if(m_tb_prefs.getIntPref("extensions.torbutton.shutdown_method") == 2) {
+            if(m_tb_prefs.getBoolPref('extensions.torbutton.dual_cookie_jars'))
+                selector.saveCookies("tor");
+            selector.saveCookies("nontor");
+        } else if(m_tb_prefs.getBoolPref('extensions.torbutton.dual_cookie_jars')) {
+            selector.saveCookies("tor");
+        }
+    }
     this.unregister();
   }
 },

Modified: torbutton/trunk/src/install.rdf
===================================================================
--- torbutton/trunk/src/install.rdf	2007-09-29 03:24:18 UTC (rev 11704)
+++ torbutton/trunk/src/install.rdf	2007-09-29 04:38:27 UTC (rev 11705)
@@ -6,7 +6,7 @@
         <em:name>Torbutton</em:name>
         <em:creator>Scott Squires &amp; Mike Perry</em:creator>
         <em:id>{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}</em:id>
-        <em:version>1.1.8-alpha-dev</em:version>
+        <em:version>1.1.7-alpha-dev</em:version>
         <em:homepageURL>http://torbutton.torproject.org/dev/</em:homepageURL>
         <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>
         <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>