[or-cvs] [torbutton/maint-1.2] Fix namespace issues for bug 1088.

[mikeperry@xxxxxxxx]

Author: Mike Perry <mikeperry-git@xxxxxxxxxx>
Date: Mon, 23 Nov 2009 11:13:33 -0800
Subject: Fix namespace issues for bug 1088.
Commit: 10ef18bfbeec3b1b100453a7c730cf0e1b9c4a16

---
 src/chrome/content/torbutton.js       |   10 +++++-----
 src/components/cookie-jar-selector.js |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index 94aab6b..98c0aa5 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -1478,7 +1478,7 @@ function torbutton_browser_proxy_prefs_init()
   else
   {
     document.getElementById('networkProxyType').disabled = true;
-    for (i = 0; i < _elementIDs.length; i++)
+    for (var i = 0; i < _elementIDs.length; i++)
         document.getElementById(_elementIDs[i]).setAttribute( "disabled", "true" );
   }
 
@@ -1529,7 +1529,7 @@ function torbutton_clear_cookies() {
 
 function torbutton_jar_cookies(mode) {
     var selector =
-          Components.classes["@stanford.edu/cookie-jar-selector;1"]
+          Components.classes["@torproject.org/cookie-jar-selector;1"]
                     .getService(Components.interfaces.nsISupports)
                     .wrappedJSObject;
 
@@ -2140,7 +2140,7 @@ function torbutton_conditional_set(state) {
 function torbutton_restore_cookies()
 {
     var selector =
-          Components.classes["@stanford.edu/cookie-jar-selector;1"]
+          Components.classes["@torproject.org/cookie-jar-selector;1"]
                     .getService(Components.interfaces.nsISupports)
                     .wrappedJSObject;
     torbutton_log(4, "Restoring cookie status");
@@ -2635,7 +2635,7 @@ observe : function(subject, topic, data) {
         m_tb_prefs.getBoolPref("extensions.torbutton.tor_enabled"))
         || m_tb_prefs.getIntPref("extensions.torbutton.shutdown_method") == 2) {
         var selector =
-            Components.classes["@stanford.edu/cookie-jar-selector;1"]
+            Components.classes["@torproject.org/cookie-jar-selector;1"]
             .getService(Components.interfaces.nsISupports)
             .wrappedJSObject;
         selector.clearCookies();
@@ -3146,7 +3146,7 @@ function torbutton_check_flag(obj, flag) {
     }
 }
 
-function torbutton_is_same_origin(source, target) { // unused.
+function torbutton_is_same_origin(win, source, target) { // unused.
     var fixup = Components.classes["@mozilla.org/docshell/urifixup;1"]
         .getService(Components.interfaces.nsIURIFixup);
     var source = fixup.createFixupURI(win.top.location.href, 0);
diff --git a/src/components/cookie-jar-selector.js b/src/components/cookie-jar-selector.js
index f3d7c07..87cf264 100644
--- a/src/components/cookie-jar-selector.js
+++ b/src/components/cookie-jar-selector.js
@@ -11,7 +11,7 @@
 
 // Module specific constants
 const kMODULE_NAME = "Cookie Jar Selector";
-const kMODULE_CONTRACTID = "@stanford.edu/cookie-jar-selector;1";
+const kMODULE_CONTRACTID = "@torproject.org/cookie-jar-selector;1";
 const kMODULE_CID = Components.ID("e6204253-b690-4159-bfe8-d4eedab6b3be");
 
 const Cr = Components.results;
-- 
1.5.6.5