* 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
@@ -21,11 +21,7 @@ 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);" />

 

 </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
@@ -316,5 +316,5 @@ function isKnownServiceType(type)
 function getServiceClass(type)

 {

-        if (isKnownServiceType(type)) {

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

                 return SERVICE_CLASSES[type.toLowerCase()];

         }

@@ -798,5 +798,5 @@ XRIChannel.prototype = {
 

 

-/* public fields (nsIChannel implmentation) */

+/* public fields (nsIChannel implementation) */

         allowPipelining: false,

         redirectionLimit: 5,

@@ -816,4 +816,5 @@ XRIChannel.prototype = {
                 }

                 catch (e) {

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

                         throw e;

                 }

@@ -829,10 +830,7 @@ 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
@@ -6,5 +6,5 @@
   <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>

    

@@ -15,5 +15,5 @@
         <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>