author | williamt <williamt> | 2007-01-05 10:10:55 (UTC) |
---|---|---|
committer | williamt <williamt> | 2007-01-05 10:10:55 (UTC) |
commit | d85adfb349b3c7a988bec21fcbad86f5f98c70de (patch) (unidiff) | |
tree | b0bff7d20e03d2e4ba4bfb3309059930006ab927 | |
parent | c4b3096e166a0a9a60fd27c8f2dc06e688f13172 (diff) | |
download | foxri-d85adfb349b3c7a988bec21fcbad86f5f98c70de.zip foxri-d85adfb349b3c7a988bec21fcbad86f5f98c70de.tar.gz foxri-d85adfb349b3c7a988bec21fcbad86f5f98c70de.tar.bz2 |
* Updated for Firefox 2REL_1_1_2upstream/master
-rwxr-xr-x | src/chrome/content/foxri.xul | 8 | ||||
-rwxr-xr-x | src/components/xriProtocolHandler.js | 10 | ||||
-rwxr-xr-x | src/install.rdf | 4 |
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) | |||
22 | 22 | ||
23 | <toolbaritem id="urlbar-container"> | 23 | <textbox id="urlbar" ontextentered="xriFix(); return handleURLBarCommand(param);" /> |
24 | <textbox id="urlbar" ontextentered="xriFix(); return handleURLBarCommand(param);" /> | ||
25 | </toolbaritem> | ||
26 | 24 | ||
27 | <toolbaritem id="go-container"> | 25 | <toolbarbutton id="go-button" oncommand="xriFix(); return handleURLBarCommand(event);" /> |
28 | <toolbarbutton id="go-button" oncommand="xriFix(); return handleURLBarCommand(event);" /> | ||
29 | </toolbaritem> | ||
30 | 26 | ||
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) | |||
317 | { | 317 | { |
318 | if (isKnownServiceType(type)) { | 318 | if (type && isKnownServiceType(type)) { |
319 | return SERVICE_CLASSES[type.toLowerCase()]; | 319 | return SERVICE_CLASSES[type.toLowerCase()]; |
@@ -799,3 +799,3 @@ XRIChannel.prototype = { | |||
799 | 799 | ||
800 | /* public fields (nsIChannel implmentation) */ | 800 | /* public fields (nsIChannel implementation) */ |
801 | allowPipelining: false, | 801 | allowPipelining: false, |
@@ -817,2 +817,3 @@ XRIChannel.prototype = { | |||
817 | catch (e) { | 817 | catch (e) { |
818 | dump("getRequestHeader - got exception: " + e + "\n"); | ||
818 | throw e; | 819 | throw e; |
@@ -830,8 +831,5 @@ XRIChannel.prototype = { | |||
830 | catch (e) { | 831 | catch (e) { |
832 | dump("getResponseHeader - got exception: " + e + "\n"); | ||
831 | throw e; | 833 | throw e; |
832 | } | 834 | } |
833 | /* XXX | ||
834 | if (header == "Content-Type") | ||
835 | return "text/html"; | ||
836 | */ | ||
837 | return null; | 835 | 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 @@ | |||
7 | <em:id>foxri@foxri.net</em:id> | 7 | <em:id>foxri@foxri.net</em:id> |
8 | <em:version>1.1.1</em:version> | 8 | <em:version>1.1.2</em:version> |
9 | <em:type>2</em:type> | 9 | <em:type>2</em:type> |
@@ -16,3 +16,3 @@ | |||
16 | <em:minVersion>1.0</em:minVersion> | 16 | <em:minVersion>1.0</em:minVersion> |
17 | <em:maxVersion>1.5.0.*</em:maxVersion> | 17 | <em:maxVersion>2.0.*</em:maxVersion> |
18 | </Description> | 18 | </Description> |