[or-cvs] r11596: Bug 510 fix: Leave the clear private data settings alone for (in torbutton/trunk/src: . chrome/content chrome/locale/de-AT chrome/locale/de-CH chrome/locale/de-DE chrome/locale/el-GR chrome/locale/en-US chrome/locale/es-AR chrome/locale/fr-FR chrome/locale/hr-HR chrome/locale/it-IT chrome/locale/nl-NL chrome/locale/pl-PL chrome/locale/pt-BR chrome/locale/ru-RU chrome/locale/sl-SI chrome/locale/zh-CN chrome/locale/zh-TW)

mikeperry at seul.org mikeperry at seul.org
Sun Sep 23 21:37:13 UTC 2007


Author: mikeperry
Date: 2007-09-23 17:37:12 -0400 (Sun, 23 Sep 2007)
New Revision: 11596

Modified:
   torbutton/trunk/src/chrome/content/torbutton.js
   torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd
   torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd
   torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd
   torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd
   torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd
   torbutton/trunk/src/chrome/locale/es-AR/torbutton.dtd
   torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd
   torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd
   torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd
   torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd
   torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd
   torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd
   torbutton/trunk/src/chrome/locale/ru-RU/torbutton.dtd
   torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd
   torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd
   torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd
   torbutton/trunk/src/install.rdf
Log:

Bug 510 fix: Leave the clear private data settings alone for
clearing cookies at shutdown. Do it ourselves with our own
event handler.



Modified: torbutton/trunk/src/chrome/content/torbutton.js
===================================================================
--- torbutton/trunk/src/chrome/content/torbutton.js	2007-09-23 15:53:43 UTC (rev 11595)
+++ torbutton/trunk/src/chrome/content/torbutton.js	2007-09-23 21:37:12 UTC (rev 11596)
@@ -513,18 +513,6 @@
         }
     }
 
-    if(torprefs.getIntPref("shutdown_method") == 1) {
-        // clear cookies on shutdown only if tor is enabled.
-        m_tb_prefs.setBoolPref("privacy.item.cookies", true);
-        m_tb_prefs.setBoolPref("privacy.sanitize.promptOnSanitize", false);
-        m_tb_prefs.setBoolPref("privacy.sanitize.sanitizeOnShutdown", mode);
-    } else if(torprefs.getIntPref("shutdown_method") == 2) {
-        // clear cookies on shutdown always
-        m_tb_prefs.setBoolPref("privacy.item.cookies", true);
-        m_tb_prefs.setBoolPref("privacy.sanitize.promptOnSanitize", false);
-        m_tb_prefs.setBoolPref("privacy.sanitize.sanitizeOnShutdown", true);
-    }
-
     if (torprefs.getBoolPref("no_updates")) {
         m_tb_prefs.setBoolPref("extensions.update.enabled", !mode);
         m_tb_prefs.setBoolPref("app.update.enabled", !mode);
@@ -830,6 +818,12 @@
         // Still called by pref observer:
         // torbutton_update_status(false, false);
     }
+
+    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();
+    } 
     this.unregister();
   }
 },

Modified: torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd	2007-09-23 15:53:43 UTC (rev 11595)
+++ torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd	2007-09-23 21:37:12 UTC (rev 11596)
@@ -51,7 +51,7 @@
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown           "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.no_shutdown           "Do not clear my cookies at shutdown">
 <!ENTITY torbutton.prefs.disable_sessionstore  "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers               "Headers">
 <!ENTITY torbutton.prefs.spoof_english         "Spoof US English Browser">

Modified: torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd	2007-09-23 15:53:43 UTC (rev 11595)
+++ torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd	2007-09-23 21:37:12 UTC (rev 11596)
@@ -51,7 +51,7 @@
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown           "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.no_shutdown           "Do not clear my cookies at shutdown">
 <!ENTITY torbutton.prefs.disable_sessionstore  "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers               "Headers">
 <!ENTITY torbutton.prefs.spoof_english         "Spoof US English Browser">

Modified: torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd	2007-09-23 15:53:43 UTC (rev 11595)
+++ torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd	2007-09-23 21:37:12 UTC (rev 11596)
@@ -51,7 +51,7 @@
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown           "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.no_shutdown           "Do not clear my cookies at shutdown">
 <!ENTITY torbutton.prefs.disable_sessionstore  "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers               "Headers">
 <!ENTITY torbutton.prefs.spoof_english         "Spoof US English Browser">

Modified: torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd	2007-09-23 15:53:43 UTC (rev 11595)
+++ torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd	2007-09-23 21:37:12 UTC (rev 11596)
@@ -51,7 +51,7 @@
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown           "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.no_shutdown           "Do not clear my cookies at shutdown">
 <!ENTITY torbutton.prefs.disable_sessionstore  "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers               "Headers">
 <!ENTITY torbutton.prefs.spoof_english         "Spoof US English Browser">

Modified: torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd	2007-09-23 15:53:43 UTC (rev 11595)
+++ torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd	2007-09-23 21:37:12 UTC (rev 11596)
@@ -51,7 +51,7 @@
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown           "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.no_shutdown           "Do not clear my cookies at shutdown">
 <!ENTITY torbutton.prefs.disable_sessionstore  "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers               "Headers">
 <!ENTITY torbutton.prefs.spoof_english         "Spoof US English Browser">

Modified: torbutton/trunk/src/chrome/locale/es-AR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/es-AR/torbutton.dtd	2007-09-23 15:53:43 UTC (rev 11595)
+++ torbutton/trunk/src/chrome/locale/es-AR/torbutton.dtd	2007-09-23 21:37:12 UTC (rev 11596)
@@ -51,7 +51,7 @@
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown           "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.no_shutdown           "Do not clear my cookies at shutdown">
 <!ENTITY torbutton.prefs.disable_sessionstore  "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers               "Headers">
 <!ENTITY torbutton.prefs.spoof_english         "Spoof US English Browser">

Modified: torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd	2007-09-23 15:53:43 UTC (rev 11595)
+++ torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd	2007-09-23 21:37:12 UTC (rev 11596)
@@ -51,7 +51,7 @@
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown           "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.no_shutdown           "Do not clear my cookies at shutdown">
 <!ENTITY torbutton.prefs.disable_sessionstore  "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers               "Headers">
 <!ENTITY torbutton.prefs.spoof_english         "Spoof US English Browser">

Modified: torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd	2007-09-23 15:53:43 UTC (rev 11595)
+++ torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd	2007-09-23 21:37:12 UTC (rev 11596)
@@ -51,7 +51,7 @@
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown           "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.no_shutdown           "Do not clear my cookies at shutdown">
 <!ENTITY torbutton.prefs.disable_sessionstore  "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers               "Headers">
 <!ENTITY torbutton.prefs.spoof_english         "Spoof US English Browser">

Modified: torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd	2007-09-23 15:53:43 UTC (rev 11595)
+++ torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd	2007-09-23 21:37:12 UTC (rev 11596)
@@ -51,7 +51,7 @@
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown           "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.no_shutdown           "Do not clear my cookies at shutdown">
 <!ENTITY torbutton.prefs.disable_sessionstore  "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers               "Headers">
 <!ENTITY torbutton.prefs.spoof_english         "Spoof US English Browser">

Modified: torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd	2007-09-23 15:53:43 UTC (rev 11595)
+++ torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd	2007-09-23 21:37:12 UTC (rev 11596)
@@ -51,7 +51,7 @@
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown           "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.no_shutdown           "Do not clear my cookies at shutdown">
 <!ENTITY torbutton.prefs.disable_sessionstore  "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers               "Headers">
 <!ENTITY torbutton.prefs.spoof_english         "Spoof US English Browser">

Modified: torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd	2007-09-23 15:53:43 UTC (rev 11595)
+++ torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd	2007-09-23 21:37:12 UTC (rev 11596)
@@ -51,7 +51,7 @@
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown           "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.no_shutdown           "Do not clear my cookies at shutdown">
 <!ENTITY torbutton.prefs.disable_sessionstore  "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers               "Headers">
 <!ENTITY torbutton.prefs.spoof_english         "Spoof US English Browser">

Modified: torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd	2007-09-23 15:53:43 UTC (rev 11595)
+++ torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd	2007-09-23 21:37:12 UTC (rev 11596)
@@ -51,7 +51,7 @@
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown           "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.no_shutdown           "Do not clear my cookies at shutdown">
 <!ENTITY torbutton.prefs.disable_sessionstore  "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers               "Headers">
 <!ENTITY torbutton.prefs.spoof_english         "Spoof US English Browser">

Modified: torbutton/trunk/src/chrome/locale/ru-RU/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/ru-RU/torbutton.dtd	2007-09-23 15:53:43 UTC (rev 11595)
+++ torbutton/trunk/src/chrome/locale/ru-RU/torbutton.dtd	2007-09-23 21:37:12 UTC (rev 11596)
@@ -51,7 +51,7 @@
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown           "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.no_shutdown           "Do not clear my cookies at shutdown">
 <!ENTITY torbutton.prefs.disable_sessionstore  "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers               "Headers">
 <!ENTITY torbutton.prefs.spoof_english         "Spoof US English Browser">

Modified: torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd	2007-09-23 15:53:43 UTC (rev 11595)
+++ torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd	2007-09-23 21:37:12 UTC (rev 11596)
@@ -51,7 +51,7 @@
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown           "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.no_shutdown           "Do not clear my cookies at shutdown">
 <!ENTITY torbutton.prefs.disable_sessionstore  "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers               "Headers">
 <!ENTITY torbutton.prefs.spoof_english         "Spoof US English Browser">

Modified: torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd	2007-09-23 15:53:43 UTC (rev 11595)
+++ torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd	2007-09-23 21:37:12 UTC (rev 11596)
@@ -51,7 +51,7 @@
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown           "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.no_shutdown           "Do not clear my cookies at shutdown">
 <!ENTITY torbutton.prefs.disable_sessionstore  "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers               "Headers">
 <!ENTITY torbutton.prefs.spoof_english         "Spoof US English Browser">

Modified: torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd	2007-09-23 15:53:43 UTC (rev 11595)
+++ torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd	2007-09-23 21:37:12 UTC (rev 11596)
@@ -51,7 +51,7 @@
 <!ENTITY torbutton.prefs.shutdown              "Shutdown">
 <!ENTITY torbutton.prefs.tor_shutdown          "Clear cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown           "Let me manage my own Private Data settings">
+<!ENTITY torbutton.prefs.no_shutdown           "Do not clear my cookies at shutdown">
 <!ENTITY torbutton.prefs.disable_sessionstore  "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers               "Headers">
 <!ENTITY torbutton.prefs.spoof_english         "Spoof US English Browser">

Modified: torbutton/trunk/src/install.rdf
===================================================================
--- torbutton/trunk/src/install.rdf	2007-09-23 15:53:43 UTC (rev 11595)
+++ torbutton/trunk/src/install.rdf	2007-09-23 21:37:12 UTC (rev 11596)
@@ -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.7-alpha</em:version>
+        <em:version>1.1.8-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>



More information about the tor-commits mailing list