[Pkg-mozext-commits] [SCM] torbutton Debian packaging branch, upstream, updated. 1.4.5.1-57-g7a85d55

[Mike Perry]

The following commit has been merged in the upstream branch:
commit 0197222e341ed7f331cfaf9a1582c84f963348df
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Tue Sep 11 14:43:19 2012 -0700

    Disable update tor proxy filter.
    
    It might not be causing any problems, but it's not functional any more either.

diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index a7c91dc..2ced2fd 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -3894,7 +3894,7 @@ unregister : function() {
 }
 
 // Bug 1506 P0: Forces torbutton updates over tor when in non-tor mode.
-// Kill it.
+// Actually, this observer is already disabled due to being irrelevant.
 var torbutton_proxyservice = {
   applyFilter : function(ps, uri, proxy) {
     try {
@@ -4065,7 +4065,8 @@ function torbutton_do_main_window_startup()
     torbutton_unique_pref_observer.register();
     torbutton_http_observer.register();
     torbutton_cookie_observer.register();
-    torbutton_proxyservice.register();
+    // Not needed
+    //torbutton_proxyservice.register();
 
     // Bug 1506: This is probably the most important observer in this function
     // XXX: We should fold this into our code/move it to its own component
@@ -4485,7 +4486,8 @@ function torbutton_close_window(event) {
         torbutton_unique_pref_observer.unregister();
         torbutton_http_observer.unregister();
         torbutton_cookie_observer.unregister();
-        torbutton_proxyservice.unregister();
+        // Not needed
+        //torbutton_proxyservice.unregister();
 
         // XXX: We should fold this into our code..
         SSC_controller.removeListener();

-- 
torbutton Debian packaging