[or-cvs] [torbutton/master] Fix bug 1169: allow chrome popups.

[mikeperry at seul.org]

Author: Mike Perry <mikeperry-git at fscked.org>
Date: Mon, 14 Dec 2009 16:00:29 -0800
Subject: Fix bug 1169: allow chrome popups.
Commit: b6b21a4558e5882ef407a5c6412ef1b587cfd1d0

Fixes conflict with google toolbar and possibly speeddial/others.
---
 src/chrome/content/torbutton.js |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 1159c4d..f388d52 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -3643,10 +3643,10 @@ var torbutton_weblistener =
   onLocationChange: function(aProgress, aRequest, aURI)
   {
       torbutton_eclog(2, 'onLocationChange: '+aURI.asciiSpec);
-      if(aURI.spec != "about:blank") {
-          return torbutton_check_progress(aProgress, aRequest, 0, true);
+      if(aURI.scheme == "about" || aURI.scheme == "chrome") {
+          torbutton_eclog(3, "Skipping location change for "+aURI.asciiSpec);
       } else {
-          torbutton_eclog(3, "Skipping location change for about:blank");
+          return torbutton_check_progress(aProgress, aRequest, 0, true);
       }
   },
 
-- 
1.5.6.5