From f12fc3db2acda5db1d286972a6fa4ca79fcae790 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 15 Nov 2009 05:21:32 +1100
Subject: [PATCH] Resurrect Xulmus.

So I can wake the neighbours, Apocalypse in 9/8 should do the trick.

--HG--
extra : rebase_source : 7bcb69c8305b738a4017ca63b502b1e73babd71f
---
 xulmus/content/config.js          | 8 +++++++-
 xulmus/content/liberator.dtd      | 2 +-
 xulmus/install.rdf                | 2 +-
 xulmus/locale/en-US/liberator.dtd | 4 ++++
 4 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 xulmus/locale/en-US/liberator.dtd

diff --git a/xulmus/content/config.js b/xulmus/content/config.js
index 4751b76a..f4a2d06e 100644
--- a/xulmus/content/config.js
+++ b/xulmus/content/config.js
@@ -6,7 +6,7 @@
 
 Components.utils.import("resource://gre/modules/utils.js"); // XXX
 
-const Config = Module("config", {
+const Config = Module("config", ConfigBase, {
     init: function () {
         // TODO: mention this to SB devs, they seem keen to provide these
         // functions to make porting from FF as simple as possible.
@@ -144,12 +144,18 @@ const Config = Module("config", {
     },
 
     hasTabbrowser: true,
+    // FIXME: unless I'm seeing double in in the wee small hours gBrowser is
+    // first set from getBrowser which they've deprecated in FF.
+    get tabbrowser() window.getBrowser(),
+    get browser() window.getBrowser(),
 
     modes: [["PLAYER", { char: "p" }]],
 
     scripts: [
         "browser.js",
         "bookmarks.js",
+        "history.js",
+        "quickmarks.js",
         "tabs.js",
         "player.js",
         "library.js"
diff --git a/xulmus/content/liberator.dtd b/xulmus/content/liberator.dtd
index 87fdc200..3c8442f6 100644
--- a/xulmus/content/liberator.dtd
+++ b/xulmus/content/liberator.dtd
@@ -6,7 +6,7 @@
 <!ENTITY liberator.name "xulmus">
 <!ENTITY liberator.appname "Xulmus">
 <!ENTITY liberator.idname "XULMUS">
-<!ENTITY liberator.host "&brandShortName">
+<!ENTITY liberator.host "&brandShortName;">
 <!ENTITY liberator.hostbin "songbird">
 <!ENTITY liberator.statusBefore "statusbar-display">
 <!ENTITY liberator.statusAfter "">
diff --git a/xulmus/install.rdf b/xulmus/install.rdf
index d5cd04c6..790da2fa 100644
--- a/xulmus/install.rdf
+++ b/xulmus/install.rdf
@@ -16,7 +16,7 @@
             <Description>
                 <em:id>songbird@songbirdnest.com</em:id>
                 <em:minVersion>0.8.0pre</em:minVersion>
-                <em:maxVersion>1.2.0</em:maxVersion>
+                <em:maxVersion>1.4.0</em:maxVersion>
             </Description>
         </em:targetApplication>
     </Description>
diff --git a/xulmus/locale/en-US/liberator.dtd b/xulmus/locale/en-US/liberator.dtd
new file mode 100644
index 00000000..97f7b270
--- /dev/null
+++ b/xulmus/locale/en-US/liberator.dtd
@@ -0,0 +1,4 @@
+
+<!ENTITY appname "Xulmus">
+<!ENTITY hostapp "Songbird">
+