Bugfixes.

2.0.1 release

git-svn-id: http://einaregilsson.googlecode.com/svn/mozilla/redirector/trunk@304 119bf307-c92d-0410-89bd-8f53e6181181

9 files changed, 10 insertions, 10 deletions

diff --git a/build.py b/build.py
index 0072e98..d75d1e4 100644
--- a/build.py
+++ b/build.py
@@ -6,7 +6,7 @@ for f in os.listdir('.'):
 		os.system(r'xpidl -m typelib -e ..\%s %s' % (f[:-3] + 'xpt',f))

 os.chdir(r'..\..')

 

-xpi = zipfile.ZipFile('redirector-2.0.xpi','w')

+xpi = zipfile.ZipFile('redirector-2.0.1.xpi','w')

 for (root, folders, files) in os.walk('.'):

 	if not '.svn' in root:

 		for f in files:

diff --git a/chrome/content/code/browserOverlay.xul.js b/chrome/content/code/browserOverlay.xul.js
index e194e5f..19a37df 100644
--- a/chrome/content/code/browserOverlay.xul.js
+++ b/chrome/content/code/browserOverlay.xul.js
@@ -15,7 +15,7 @@ var RedirectorOverlay = {
 				.addEventListener("popupshowing", function(e) { RedirectorOverlay.showContextMenu(e); }, false);
 			
 			this.strings = document.getElementById("redirector-strings");
-			this.prefs = new Prefs();
+			this.prefs = new RedirectorPrefs();
 			this.changedPrefs(this.prefs);
 			this.prefs.addListener(this);
 		} catch(e) {
diff --git a/chrome/content/code/redirector.prototype.js b/chrome/content/code/redirector.prototype.js
index ecdcbd3..8f4cf6a 100644
--- a/chrome/content/code/redirector.prototype.js
+++ b/chrome/content/code/redirector.prototype.js
@@ -237,7 +237,7 @@ Redirector.prototype = {
 		if (this._prefs) {

 			this._prefs.dispose();

 		}

-		this._prefs = new Prefs();

+		this._prefs = new RedirectorPrefs();

 		//Check if we need to update existing redirects

 		var data = this._prefs.redirects;

 		var version = this._prefs.version;

diff --git a/chrome/content/code/prefs.js b/chrome/content/code/redirectorprefs.js
index 055293b..52c3056 100644
--- a/chrome/content/code/prefs.js
+++ b/chrome/content/code/redirectorprefs.js
@@ -1,10 +1,10 @@
 // $Id$

 

-function Prefs() {

+function RedirectorPrefs() {

 	this.init();	

 }

 

-Prefs.prototype = {

+RedirectorPrefs.prototype = {

 

 	//Preferences:

 	_version : null,

diff --git a/chrome/content/code/settings.xul.js b/chrome/content/code/settings.xul.js
index 21f514f..4fa65a2 100644
--- a/chrome/content/code/settings.xul.js
+++ b/chrome/content/code/settings.xul.js
@@ -35,7 +35,7 @@ var Settings = {
 			this.chkShowContextMenu = document.getElementById('chkShowContextMenu');

 			this.chkEnableDebugOutput = document.getElementById('chkEnableDebugOutput');

 			

-			this.prefs = new Prefs();

+			this.prefs = new RedirectorPrefs();

 			//Preferences

 			this.changedPrefs(this.prefs);

 			this.prefs.addListener(this);

diff --git a/chrome/content/ui/browserOverlay.xul b/chrome/content/ui/browserOverlay.xul
index 9a72e52..32bf1d5 100644
--- a/chrome/content/ui/browserOverlay.xul
+++ b/chrome/content/ui/browserOverlay.xul
@@ -4,7 +4,7 @@
 <overlay id="redirector-overlay"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script src="../code/redirect.js"/>
-  <script src="../code/prefs.js"/>
+  <script src="../code/redirectorprefs.js"/>
   <script src="../code/browserOverlay.xul.js"/>
 
   <stringbundleset id="stringbundleset">
diff --git a/chrome/content/ui/settings.xul b/chrome/content/ui/settings.xul
index cc9cbf4..27f16dd 100644
--- a/chrome/content/ui/settings.xul
+++ b/chrome/content/ui/settings.xul
@@ -16,7 +16,7 @@
 		xmlns:nc="http://home.netscape.com/NC-rdf#"

         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

 

-	<script type="application/x-javascript" src="../code/prefs.js"/>

+	<script type="application/x-javascript" src="../code/redirectorprefs.js"/>

 	<script type="application/x-javascript" src="../code/redirect.js"/>

 	<script type="application/x-javascript" src="../code/settings.xul.js"/>

 	<stringbundleset id="stringbundleset">

diff --git a/components/redirector.component.js b/components/redirector.component.js
index 73219ad..ee2e584 100644
--- a/components/redirector.component.js
+++ b/components/redirector.component.js
@@ -14,7 +14,7 @@ function Redirector() {
 try {

 	loader.loadSubScript('chrome://redirector/content/code/redirector.prototype.js');

 	loader.loadSubScript('chrome://redirector/content/code/redirect.js');

-	loader.loadSubScript('chrome://redirector/content/code/prefs.js');

+	loader.loadSubScript('chrome://redirector/content/code/redirectorprefs.js');

 } catch(e) {

 	for (i in e) {

 		Cc["@mozilla.org/consoleservice;1"].getService(Ci.nsIConsoleService).logStringMessage('REDIRECTOR: Loading Redirector implementation failed: ' + i + e[i]);

diff --git a/install.rdf b/install.rdf
index 0860b3c..457cee8 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,7 +5,7 @@
   <Description about="urn:mozilla:install-manifest">
     <em:id>redirector@einaregilsson.com</em:id>
     <em:name>Redirector</em:name>
-    <em:version>2.0</em:version>
+    <em:version>2.0.1</em:version>
     <em:creator>Einar Egilsson</em:creator>
     <em:description>Automatically redirects to user-defined urls on certain pages</em:description>
     <em:homepageURL>http://tech.einaregilsson.com/projects/redirector/</em:homepageURL>