[tor-commits] [torbutton/master] Bug #9486: Really clear NoScript Temporary Permissions on New Identity

[mikeperry at torproject.org]

commit f9721433e32291ea2954f40932fa4d96785749ac
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Mon Jan 20 20:06:06 2014 -0800

    Bug #9486: Really clear NoScript Temporary Permissions on New Identity
    
    Use the NoScript service function directly.
---
 src/chrome/content/torbutton.js |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 4d37d46..9ee5d0f 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -1460,10 +1460,11 @@ function torbutton_do_new_identity() {
   torbutton_log(3, "New Identity: Clearing NoScript Temporary Permissions");
 
   try {
-    if(m_tb_prefs.prefHasUserValue("noscript.temp"))
-      m_tb_prefs.clearUserPref("noscript.temp");
+    var nsSvc = Components.classes["@maone.net/noscript-service;1"].getService().wrappedJSObject
+    nsSvc.eraseTemp();
   } catch(e) {
-    torbutton_log(4, "New Identity: Error clearing NoScript Temporary Permissions: "+e);
+    torbutton_log(5, "New Identity: Error clearing NoScript Temporary Permissions: "+e);
+    window.alert("Torbutton: Error clearing NoScript Temporary Permissions: "+e);
   }
 
   torbutton_log(3, "New Identity: Clearing HTTP Auth");