From 1990409836b3e08aad8ccac586fd0212724d896c Mon Sep 17 00:00:00 2001
From: Philipp Kewisch <mozilla@kewis.ch>
Date: Sat, 27 Sep 2014 20:24:35 +0200
Subject: [PATCH] Version 0.13: Use inline options

---
 chrome/content/quickmove-prefs.xul | 27 ---------------------------
 install.rdf                        |  4 ++--
 options.xul                        | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 29 deletions(-)
 delete mode 100644 chrome/content/quickmove-prefs.xul
 create mode 100644 options.xul

diff --git a/chrome/content/quickmove-prefs.xul b/chrome/content/quickmove-prefs.xul
deleted file mode 100644
index f3b0cdf..0000000
--- a/chrome/content/quickmove-prefs.xul
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
-   - Portions Copyright (C) Philipp Kewisch, 2010-2014 -->
-
-<?xml-stylesheet href="chrome://global/skin/"?>
-
-<!DOCTYPE prefwindow SYSTEM "chrome://quickmove/locale/quickmove.dtd">
-
-<prefwindow xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-            id="quickmove-prefs-window"
-            width="300"
-            height="100"
-            windowtype="extensions:quickmove:options"
-            title="&quickmove.options.title;">
-  <preferences>
-    <preference id="extensions.quickmove.maxRecentFolders" name="extensions.quickmove.maxRecentFolders" type="int"/>
-  </preferences>
-  <prefpane id="quickmove-prefpane">
-    <label for="quickmove-maxRecentFolders-textbox" value="&quickmove.options.maxRecentFolders.label;"/>
-    <textbox id="quickmove-maxRecentFolders-textbox"
-             type="number"
-             preference="extensions.quickmove.maxRecentFolders"
-             tooltiptext="&quickmove.options.maxRecentFolders.tooltip;"/>
-  </prefpane>
-</prefwindow>
diff --git a/install.rdf b/install.rdf
index d78216e..128221d 100644
--- a/install.rdf
+++ b/install.rdf
@@ -9,13 +9,13 @@
   <Description about="urn:mozilla:install-manifest">
     <em:id>quickmove@mozilla.kewis.ch</em:id>
     <em:type>2</em:type>
-    <em:version>0.12</em:version>
+    <em:version>0.13</em:version>
 
     <em:name>Quick Folder Move</em:name>
     <em:description>Quickly move messages into other folders using the keyboard</em:description>
 
     <em:creator>Philipp Kewisch</em:creator>
-    <em:optionsURL>chrome://quickmove/content/quickmove-prefs.xul</em:optionsURL>
+    <em:optionsType>2</em:optionsType>
     <em:iconURL>chrome://messenger/skin/activity/moveMailIcon.png</em:iconURL>
 
     <em:translator>Kostyantyn Zhytnetskyy (uk and ru)</em:translator>
diff --git a/options.xul b/options.xul
new file mode 100644
index 0000000..889f83d
--- /dev/null
+++ b/options.xul
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
+   - Portions Copyright (C) Philipp Kewisch, 2014 -->
+
+<!DOCTYPE vbox SYSTEM "chrome://quickmove/locale/quickmove.dtd">
+
+<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <setting type="integer"
+           pref="extensions.quickmove.maxRecentFolders"
+           title="&quickmove.options.maxRecentFolders.label;"
+           desc="&quickmove.options.maxRecentFolders.tooltip;"/>
+</vbox>