[or-cvs] [torbutton/maint-1.2 03/37] Fix bug 1032 - Apply mystery patch from anonymous commenter.

[mikeperry at torproject.org]

Author: Mike Perry <mikeperry-git at fscked.org>
Date: Wed, 17 Mar 2010 18:12:02 -0700
Subject: Fix bug 1032 - Apply mystery patch from anonymous commenter.
Commit: 462e1e205789cb62cb0e8a7adc1f4e56b0e03938

Always take patches from strangers, kids. They're usually very very
delicious.
---
 src/chrome/content/torbutton.js |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 9ef4564..b4b141d 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -2862,7 +2862,8 @@ unregister : function() {
 var torbutton_proxyservice = {
   applyFilter : function(ps, uri, proxy) {
     try {
-      torbutton_eclog(3, 'apply: '+uri.host+' '+uri.scheme+', '+proxy);
+      proxyhost = proxy ? 'proxy: '+proxy.host:'no proxy';
+      torbutton_eclog(3, 'apply: '+proxyhost);
       if (m_tb_prefs.getBoolPref("extensions.torbutton.tor_enabled")) {
         if (uri.host == "localhost") return null;
       }
@@ -2887,7 +2888,7 @@ var torbutton_proxyservice = {
     try {
     var proxyservice = Components.classes["@mozilla.org/network/protocol-proxy-service;1"]
       .getService(Components.interfaces.nsIProtocolProxyService);
-    proxyservice.unregisterFilter(this, 0);
+    proxyservice.unregisterFilter(this);
     } catch (e) {
       torbutton_eclog(3, 'UnregisterFilter failed:'+e);
     }
-- 
1.6.5