[or-cvs] r12131: *sigh* 1.1.9 broke plugins for non-tor usage. Might as well (in torbutton/trunk/src: . components)

[mikeperry@xxxxxxxx]

Author: mikeperry
Date: 2007-10-23 04:15:02 -0400 (Tue, 23 Oct 2007)
New Revision: 12131

Modified:
   torbutton/trunk/src/CHANGELOG
   torbutton/trunk/src/components/cssblocker.js
   torbutton/trunk/src/install.rdf
Log:

*sigh* 1.1.9 broke plugins for non-tor usage. Might as well
make another release for the tor bundle.



Modified: torbutton/trunk/src/CHANGELOG
===================================================================
--- torbutton/trunk/src/CHANGELOG	2007-10-23 06:42:46 UTC (rev 12130)
+++ torbutton/trunk/src/CHANGELOG	2007-10-23 08:15:02 UTC (rev 12131)
@@ -1,6 +1,10 @@
+1.1.9.1
+  23 Oct 2007
+  * bugfix: 1.1.9 killed all plugins. Bring them back to life.
+
 1.1.9
   21 Oct 2007
-  * bugfux: bug 519: Fix Ubuntu Gutsy hang on startup.
+  * bugfix: bug 519: Fix Ubuntu Gutsy hang on startup.
   * bugfix: bug 521: Fix yet more false positive popups introduced in 1.1.8
   * bugfix: bug 522: Block loading of direct clicks of plugin-handled content 
     (discovered by goldy).

Modified: torbutton/trunk/src/components/cssblocker.js
===================================================================
--- torbutton/trunk/src/components/cssblocker.js	2007-10-23 06:42:46 UTC (rev 12130)
+++ torbutton/trunk/src/components/cssblocker.js	2007-10-23 08:15:02 UTC (rev 12131)
@@ -147,6 +147,8 @@
 			node = node.contentWindow;
 			wind = node;
 		}
+        
+        var torTag = !this._prefs.getBoolPref("extensions.torbutton.tor_enabled");
 
         if (contentType == 5) { // Object
             // Never seems to happen.. But it would be nice if we 
@@ -180,8 +182,6 @@
             return ok; 
         }
 
-        var torTag = !this._prefs.getBoolPref("extensions.torbutton.tor_enabled");
-
         if (typeof(browser.__tb_js_state) == 'undefined') {
             this.log("UNTAGGED WINDOW2!!!!!!!!! "+contentLocation.spec+"\n");
             return block;

Modified: torbutton/trunk/src/install.rdf
===================================================================
--- torbutton/trunk/src/install.rdf	2007-10-23 06:42:46 UTC (rev 12130)
+++ torbutton/trunk/src/install.rdf	2007-10-23 08:15:02 UTC (rev 12131)
@@ -6,7 +6,7 @@
         <em:name>Torbutton</em:name>
         <em:creator>Scott Squires &amp; Mike Perry</em:creator>
         <em:id>{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}</em:id>
-        <em:version>1.1.9-alpha</em:version>
+        <em:version>1.1.9.1-alpha</em:version>
         <em:homepageURL>https://torbutton.torproject.org/dev/</em:homepageURL>
         <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>
         <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>