[tbb-commits] [torbutton/master] Bug 14632: Disable Cookie Manager until we get it working.

[mikeperry at torproject.org]

commit 3b8c21044edea186da1e7039f4c4151fde3a0cd8
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Mon Feb 9 15:04:48 2015 -0800

    Bug 14632: Disable Cookie Manager until we get it working.
    
    Also update the string so it is more clear that it is a secondary
    dialog, once we do get it working again.
---
 src/chrome/content/popup.xul       |    3 ++-
 src/chrome/content/torbutton.js    |    4 ++++
 src/chrome/locale/en/torbutton.dtd |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul
index f4ad7d2..9a77c54 100644
--- a/src/chrome/content/popup.xul
+++ b/src/chrome/content/popup.xul
@@ -21,7 +21,8 @@
         <menuitem id="torbutton-cookie-protector"
                   label="&torbutton.context_menu.cookieProtections;"
                   accesskey="&torbutton.context_menu.cookieProtections.key;"
-                  insertafter="context-stop"                  
+                  insertafter="context-stop"
+                  hidden="true"
                   oncommand="torbutton_open_cookie_dialog()"/>
         <menuitem id="torbutton-preferences"
                   label="&torbutton.context_menu.preferences;"
diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 01591cc..bdb3b2d 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -2061,6 +2061,10 @@ function torbutton_update_disk_prefs() {
         m_tb_prefs.setIntPref("browser.download.manager.retention", 2);
     }
 
+    // XXX: Bug 14632: The cookie dialog is useless in private browsing mode in FF31ESR
+    // See https://trac.torproject.org/projects/tor/ticket/10353 for more info.
+    document.getElementById("torbutton-cookie-protector").hidden = mode;
+
     // Force prefs to be synced to disk
     var prefService = Components.classes["@mozilla.org/preferences-service;1"]
         .getService(Components.interfaces.nsIPrefService);
diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd
index 7a4284f..ea37d19 100644
--- a/src/chrome/locale/en/torbutton.dtd
+++ b/src/chrome/locale/en/torbutton.dtd
@@ -34,7 +34,7 @@
 <!ENTITY torbutton.context_menu.networksettings.key "S">
 <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update…">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
-<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections…">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
 <!ENTITY torbutton.context_menu.copyTor.key "p">