From d85adfb349b3c7a988bec21fcbad86f5f98c70de Mon Sep 17 00:00:00 2001
From: williamt <williamt>
Date: Fri, 05 Jan 2007 10:10:55 +0000
Subject: * Updated for Firefox 2

---
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
@@ -20,13 +20,9 @@ function xriFix(event)
 </script>
 
 
-	<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);" />
 
 </overlay>
 
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
@@ -315,7 +315,7 @@ function isKnownServiceType(type)
 
 function getServiceClass(type)
 {
-	if (isKnownServiceType(type)) {
+	if (type && isKnownServiceType(type)) {
 		return SERVICE_CLASSES[type.toLowerCase()];
 	}
 	return type;
@@ -797,7 +797,7 @@ XRIChannel.prototype = {
 	},
 
 
-/* public fields (nsIChannel implmentation) */
+/* public fields (nsIChannel implementation) */
 	allowPipelining: false,
 	redirectionLimit: 5,
 	referrer: "",
@@ -815,6 +815,7 @@ XRIChannel.prototype = {
 			return val;
 		}
 		catch (e) {
+			dump("getRequestHeader - got exception: " + e + "\n");
 			throw e;
 		}
 	},
@@ -828,12 +829,9 @@ XRIChannel.prototype = {
 			return val;
 		}
 		catch (e) {
+			dump("getResponseHeader - got exception: " + e + "\n");
 			throw e;
 		}
-/* XXX
-		if (header == "Content-Type")
-			return "text/html";
-*/
 		return null;
 	},
 	isNoCacheResponse: function() {
diff --git a/src/install.rdf b/src/install.rdf
index a482755..507420c 100755
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -5,7 +5,7 @@
 
   <Description about="urn:mozilla:install-manifest">
     <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>
    
     <!-- Target Application this extension can install into, 
@@ -14,7 +14,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>1.0</em:minVersion>
-        <em:maxVersion>1.5.0.*</em:maxVersion>
+        <em:maxVersion>2.0.*</em:maxVersion>
       </Description>
     </em:targetApplication>
    
--
cgit v0.9.0.2