[tor-commits] [torbutton/master] Bug 13746: Properly link Torbutton UI to thirdparty pref.

[mikeperry at torproject.org]

commit 25c576f13caa3d30c872876c1cab0eb3b4845af7
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed Nov 12 16:28:31 2014 -0800

    Bug 13746: Properly link Torbutton UI to thirdparty pref.
---
 src/chrome/content/torbutton.js |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index cd5f2dc..841dca8 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -2120,7 +2120,11 @@ function torbutton_update_thirdparty_prefs() {
     var mode = m_tb_prefs.getBoolPref("extensions.torbutton.restrict_thirdparty");
 
     try {
-        m_tb_prefs.setBoolPref("privacy.thirdparty.isolate", mode);
+        if (mode) {
+            m_tb_prefs.setIntPref("privacy.thirdparty.isolate", 2);
+        } else {
+            m_tb_prefs.setIntPref("privacy.thirdparty.isolate", 0);
+        }
     } catch(e) {}
 
     if (mode) {
@@ -2130,7 +2134,6 @@ function torbutton_update_thirdparty_prefs() {
     }
 
     pref("security.enable_tls_session_tickets", !mode);
-    pref("network.http.spdy.enabled", !mode);
 
     // Force prefs to be synced to disk
     var prefService = Components.classes["@mozilla.org/preferences-service;1"]