From 90e3dd345f1f2d6f9a8d820df6bb29f699f016e4 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 24 Jun 2009 21:28:07 +1000
Subject: [PATCH] Open the options help page with the addons "Options" button.

This only works for Vimperator and Xulmus as Muttator has no options
help page yet.
---
 common/content/preferences.xul | 13 ++++++++
 muttator/install.rdf           | 48 ++++++++++++++---------------
 vimperator/install.rdf         | 55 +++++++++++++++++-----------------
 xulmus/install.rdf             | 38 ++++++++++++-----------
 4 files changed, 86 insertions(+), 68 deletions(-)
 create mode 100644 common/content/preferences.xul

diff --git a/common/content/preferences.xul b/common/content/preferences.xul
new file mode 100644
index 00000000..8eb8998c
--- /dev/null
+++ b/common/content/preferences.xul
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    <script type="application/javascript;version=1.8">
+        let uri = Components.classes["@mozilla.org/network/io-service;1"]
+                            .getService(Components.interfaces.nsIIOService)
+                            .newURI("chrome://liberator/locale/options.html", null, null);
+        Application.activeWindow.open(uri).focus(); // TODO: generalise for Muttator et al.
+        window.close();
+    </script>
+</window>
+
+<!-- vim: set fdm=marker sw=4 ts=4 et: -->
diff --git a/muttator/install.rdf b/muttator/install.rdf
index 26d300e7..ae0e7b9f 100644
--- a/muttator/install.rdf
+++ b/muttator/install.rdf
@@ -1,28 +1,28 @@
 <?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:em="http://www.mozilla.org/2004/em-rdf#">
     <Description about="urn:mozilla:install-manifest">
-	<em:id>muttator@mozdev.org</em:id>
-	<em:name>Muttator</em:name>
-	<em:version>###VERSION###</em:version>
-	<em:description>Make Thunderbird behave like Vim</em:description>
-	<em:creator>Martin Stubenschrott</em:creator>
-	<em:homepageURL>http://vimperator.org/</em:homepageURL>
-	<em:iconURL>chrome://muttator/skin/icon.png</em:iconURL>
-	<em:file>
-	    <Description about="urn:mozilla:extension:file:vimperator.jar">
-			<em:package>content/muttator/</em:package>
-	    </Description>
-	</em:file>
-
-	<em:targetApplication>
-	    <Description>
-		<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-		<em:minVersion>3.0b3pre</em:minVersion>
-		<em:maxVersion>3.0b3</em:maxVersion>
-	    </Description>
-	</em:targetApplication>
-
+        <em:id>muttator@mozdev.org</em:id>
+        <em:name>Muttator</em:name>
+        <em:version>###VERSION###</em:version>
+        <em:description>Make Thunderbird behave like Vim</em:description>
+        <em:creator>Martin Stubenschrott</em:creator>
+        <em:homepageURL>http://vimperator.org/</em:homepageURL>
+        <em:iconURL>chrome://muttator/skin/icon.png</em:iconURL>
+        <em:optionsURL>chrome://liberator/content/preferences.xul</em:optionsURL>
+        <em:file>
+            <Description about="urn:mozilla:extension:file:vimperator.jar">
+                <em:package>content/muttator/</em:package>
+            </Description>
+        </em:file>
+        <em:targetApplication>
+            <Description>
+                <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
+                <em:minVersion>3.0b3pre</em:minVersion>
+                <em:maxVersion>3.0b3</em:maxVersion>
+            </Description>
+        </em:targetApplication>
     </Description>
 </RDF>
+
+<!-- vim: set fdm=marker sw=4 ts=4 et: -->
diff --git a/vimperator/install.rdf b/vimperator/install.rdf
index 0d203952..b1abea82 100644
--- a/vimperator/install.rdf
+++ b/vimperator/install.rdf
@@ -1,27 +1,28 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
-    <Description about="urn:mozilla:install-manifest">
-	<em:id>vimperator@mozdev.org</em:id>
-	<em:name>Vimperator</em:name>
-	<em:version>###VERSION###</em:version>
-	<em:description>Make Firefox behave like Vim</em:description>
-	<em:creator>Martin Stubenschrott</em:creator>
-	<em:homepageURL>http://vimperator.org</em:homepageURL>
-	<em:iconURL>chrome://vimperator/skin/icon.png</em:iconURL>
-	<em:file>
-	    <Description about="urn:mozilla:extension:file:vimperator.jar">
-		<em:package>content/vimperator/</em:package>
-	    </Description>
-	</em:file>
-
-	<em:targetApplication>
-	    <Description>
-		<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-		<em:minVersion>3.0</em:minVersion>
-		<em:maxVersion>3.6a1pre</em:maxVersion>
-	    </Description>
-	</em:targetApplication>
-    </Description>
-</RDF>
+<?xml version="1.0"?>
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+    <Description about="urn:mozilla:install-manifest">
+        <em:id>vimperator@mozdev.org</em:id>
+        <em:name>Vimperator</em:name>
+        <em:version>###VERSION###</em:version>
+        <em:description>Make Firefox behave like Vim</em:description>
+        <em:creator>Martin Stubenschrott</em:creator>
+        <em:homepageURL>http://vimperator.org</em:homepageURL>
+        <em:iconURL>chrome://vimperator/skin/icon.png</em:iconURL>
+        <em:optionsURL>chrome://liberator/content/preferences.xul</em:optionsURL>
+        <em:file>
+            <Description about="urn:mozilla:extension:file:vimperator.jar">
+                <em:package>content/vimperator/</em:package>
+            </Description>
+        </em:file>
+        <em:targetApplication>
+            <Description>
+                <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
+                <em:minVersion>3.0</em:minVersion>
+                <em:maxVersion>3.6a1pre</em:maxVersion>
+            </Description>
+        </em:targetApplication>
+    </Description>
+</RDF>
+
+<!-- vim: set fdm=marker sw=4 ts=4 et: -->
diff --git a/xulmus/install.rdf b/xulmus/install.rdf
index 975e29b3..20d8ed6e 100644
--- a/xulmus/install.rdf
+++ b/xulmus/install.rdf
@@ -1,19 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#"
-     xmlns:songbird="http://www.songbirdnest.com/2007/addon-metadata-rdf#">
-  <Description about="urn:mozilla:install-manifest">
-    <em:id>xulmus@vimperator.org</em:id>
-    <em:type>2</em:type>
-    <em:name>Xulmus</em:name>
-    <em:version>###VERSION###</em:version>
-    <em:creator>Prathyush Thota</em:creator>
-    <em:description>Makes Songbird behave like Vim and CMus.</em:description>
-    <em:targetApplication>
-      <Description>
-        <em:id>songbird@songbirdnest.com</em:id>
-        <em:minVersion>0.8.0pre</em:minVersion>
-        <em:maxVersion>1.2.0a</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-  </Description>
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:em="http://www.mozilla.org/2004/em-rdf#"
+    xmlns:songbird="http://www.songbirdnest.com/2007/addon-metadata-rdf#">
+    <Description about="urn:mozilla:install-manifest">
+        <em:id>xulmus@vimperator.org</em:id>
+        <em:type>2</em:type>
+        <em:name>Xulmus</em:name>
+        <em:version>###VERSION###</em:version>
+        <em:creator>Prathyush Thota</em:creator>
+        <em:description>Makes Songbird behave like Vim and CMus.</em:description>
+        <em:optionsURL>chrome://liberator/content/preferences.xul</em:optionsURL>
+        <em:targetApplication>
+            <Description>
+                <em:id>songbird@songbirdnest.com</em:id>
+                <em:minVersion>0.8.0pre</em:minVersion>
+                <em:maxVersion>1.2.0a</em:maxVersion>
+            </Description>
+        </em:targetApplication>
+    </Description>
 </RDF>
+
+<!-- vim: set fdm=marker sw=4 ts=4 et: -->