From 6cad409813871744f742f9e2fb13ffe437fcb25a Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Wed, 22 Mar 2006 05:47:10 +0000
Subject: [PATCH] Update to work with Gecko 1.8 branch (2.0a1) and trunk
 (1.6a1) with native mozStorage support

Disabled on 1.5, as hacks.atrus.org binaries will no longer work (the mozStorage API changed a bit)
---
 chrome/chromeFiles/content/scholar/db.js | 8 ++++----
 install.rdf                              | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/chrome/chromeFiles/content/scholar/db.js b/chrome/chromeFiles/content/scholar/db.js
index 950e395c88..bd45fe6fa4 100644
--- a/chrome/chromeFiles/content/scholar/db.js
+++ b/chrome/chromeFiles/content/scholar/db.js
@@ -57,7 +57,7 @@ Scholar.DB = new function(){
 				while (statement.executeStep()){
 					var row = new Array();
 					for(var i=0; i<statement.columnCount; i++) {
-						row[statement.getColumnName(i)] = statement.getAsUTF8String(i);
+						row[statement.getColumnName(i)] = statement.getUTF8String(i);
 					}
 					dataset.push(row);
 				}
@@ -108,10 +108,10 @@ Scholar.DB = new function(){
 			return false;
 		}
 		if (sql.indexOf('SELECT COUNT(*)') > -1){
-			var value = statement.getAsInt32(0);
+			var value = statement.getInt32(0);
 		}
 		else {
-			var value = statement.getAsUTF8String(0);
+			var value = statement.getUTF8String(0);
 		}
 		statement.reset();
 		return value;
@@ -138,7 +138,7 @@ Scholar.DB = new function(){
 		if (statement){
 			var column = new Array();
 			while (statement.executeStep()){
-				column.push(statement.getAsUTF8String(0));
+				column.push(statement.getUTF8String(0));
 			}
 			statement.reset();
 			return column.length ? column : false;
diff --git a/install.rdf b/install.rdf
index b07c365793..1394d44c5d 100644
--- a/install.rdf
+++ b/install.rdf
@@ -4,8 +4,8 @@
          xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
   <RDF:Description RDF:about="rdf:#$V4RG2"
                    em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
-                   em:minVersion="1.0+"
-                   em:maxVersion="1.5.0.*" />
+		   em:minVersion="1.6a1"
+		   em:maxVersion="2.0a1" />
   <RDF:Description RDF:about="urn:mozilla:install-manifest"
                    em:id="scholar@chnm"
                    em:name="Firefox Scholar"