* Updated for Firefox 2REL_1_1_2upstream/master

3 files changed, 8 insertions, 14 deletions

diff --git a/src/chrome/content/foxri.xul b/src/chrome/content/foxri.xul
index dc1cc37..785cc0c 100755
--- a/src/chrome/content/foxri.xul
+++ b/src/chrome/content/foxri.xul
@@ -22,9 +22,5 @@ function xriFix(event)
 

-	<toolbaritem id="urlbar-container">

-		<textbox id="urlbar" ontextentered="xriFix(); return handleURLBarCommand(param);" />

-	</toolbaritem>

+	<textbox id="urlbar" ontextentered="xriFix(); return handleURLBarCommand(param);" />

 

-	<toolbaritem id="go-container">

-		<toolbarbutton id="go-button" oncommand="xriFix(); return handleURLBarCommand(event);" />

-	</toolbaritem>

+	<toolbarbutton id="go-button" oncommand="xriFix(); return handleURLBarCommand(event);" />

 

diff --git a/src/components/xriProtocolHandler.js b/src/components/xriProtocolHandler.js
index 7046cde..1105874 100755
--- a/src/components/xriProtocolHandler.js
+++ b/src/components/xriProtocolHandler.js
@@ -317,3 +317,3 @@ function getServiceClass(type)
 {

-	if (isKnownServiceType(type)) {

+	if (type && isKnownServiceType(type)) {

 		return SERVICE_CLASSES[type.toLowerCase()];

@@ -799,3 +799,3 @@ XRIChannel.prototype = {
 

-/* public fields (nsIChannel implmentation) */

+/* public fields (nsIChannel implementation) */

 	allowPipelining: false,

@@ -817,2 +817,3 @@ XRIChannel.prototype = {
 		catch (e) {

+			dump("getRequestHeader - got exception: " + e + "\n");

 			throw e;

@@ -830,8 +831,5 @@ XRIChannel.prototype = {
 		catch (e) {

+			dump("getResponseHeader - got exception: " + e + "\n");

 			throw e;

 		}

-/* XXX

-		if (header == "Content-Type")

-			return "text/html";

-*/

 		return null;

diff --git a/src/install.rdf b/src/install.rdf
index a482755..507420c 100755
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -7,3 +7,3 @@
     <em:id>foxri@foxri.net</em:id>

-    <em:version>1.1.1</em:version>

+    <em:version>1.1.2</em:version>

     <em:type>2</em:type>

@@ -16,3 +16,3 @@
         <em:minVersion>1.0</em:minVersion>

-        <em:maxVersion>1.5.0.*</em:maxVersion>

+        <em:maxVersion>2.0.*</em:maxVersion>

       </Description>