[or-cvs] r15514: Woah, 55% of firefox users now use firefox3. We probably sho (in torbutton/trunk/src/chrome: content locale/en-US)

[mikeperry@xxxxxxxx]

Author: mikeperry
Date: 2008-06-27 13:43:38 -0400 (Fri, 27 Jun 2008)
New Revision: 15514

Modified:
   torbutton/trunk/src/chrome/content/torbutton.js
   torbutton/trunk/src/chrome/locale/en-US/torbutton.properties
Log:

Woah, 55% of firefox users now use firefox3. We probably
should warn them instead of just destroying their cookies...



Modified: torbutton/trunk/src/chrome/content/torbutton.js
===================================================================
--- torbutton/trunk/src/chrome/content/torbutton.js	2008-06-27 17:25:38 UTC (rev 15513)
+++ torbutton/trunk/src/chrome/content/torbutton.js	2008-06-27 17:43:38 UTC (rev 15514)
@@ -1245,6 +1245,14 @@
           Components.classes["@stanford.edu/cookie-jar-selector;1"]
                     .getService(Components.interfaces.nsISupports)
                     .wrappedJSObject;
+
+    if(m_tb_ff3) {
+        var o_stringbundle = torbutton_get_stringbundle();
+        var warning = o_stringbundle.GetStringFromName("torbutton.popup.ff3.cookie_warning");
+        window.alert(warning);
+        return;
+    }
+
     if(mode) {
         selector.saveCookies("nontor");
         selector.clearCookies();

Modified: torbutton/trunk/src/chrome/locale/en-US/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/en-US/torbutton.properties	2008-06-27 17:25:38 UTC (rev 15513)
+++ torbutton/trunk/src/chrome/locale/en-US/torbutton.properties	2008-06-27 17:43:38 UTC (rev 15514)
@@ -31,3 +31,4 @@
 torbutton.prefs.recommended = (recommended)
 torbutton.prefs.optional = (optional)
 torbutton.prefs.crucial = (crucial)
+torbutton.popup.ff3.cookie_warning = Firefox Bug 439384 prevents the cookie jar feature from working with Torbutton. Your cookies will leak onto the Tor network. Please encourage Mozilla to fix this bug. To disable this alert, change your Torbutton cookie settings to manual mode (dangerous), or to always clear on toggle.