From 35fbbf8af48b9d6c32e25ac2c6a29b9e59b88618 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Sat, 2 Oct 2010 12:59:11 -0400
Subject: Melodactyl naming fixes.

---
 melodactyl/content/config.js  |  5 +----
 melodactyl/content/dactyl.dtd | 17 +++++++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'melodactyl/content')

diff --git a/melodactyl/content/config.js b/melodactyl/content/config.js
index 7a8eb274..01f2a432 100644
--- a/melodactyl/content/config.js
+++ b/melodactyl/content/config.js
@@ -22,16 +22,13 @@ const Config = Module("config", ConfigBase, {
             SBGetBrowser().mCurrentBrowser.stop();
         };
     },
-    /*** required options, no checks done if they really exist, so be careful ***/
-    name: "Xulmus",
-    host: "Songbird",
 
     /*** optional options, there are checked for existence and a fallback provided  ***/
     features: ["bookmarks", "hints", "marks", "history", "quickmarks", "session", "tabs", "player"],
     defaults: {
         guioptions: "mprb",
         showtabline: 2,
-        titlestring: "Xulmus"
+        get titlestring() config.name
     },
 
     guioptions: {
diff --git a/melodactyl/content/dactyl.dtd b/melodactyl/content/dactyl.dtd
index 5372cf5f..92ffdc1f 100644
--- a/melodactyl/content/dactyl.dtd
+++ b/melodactyl/content/dactyl.dtd
@@ -4,14 +4,19 @@
 
 <!ENTITY dactyl.mainWindow "mainplayer">
 <!ENTITY dactyl.commandContainer "&dactyl.mainWindow;">
-<!ENTITY dactyl.name "xulmus">
-<!ENTITY dactyl.appName "Xulmus">
-<!ENTITY dactyl.idName "XULMUS">
-<!ENTITY dactyl.host "&brandShortName;">
-<!ENTITY dactyl.hostbin "songbird">
-<!ENTITY dactyl.fileExt "xulmus">
 <!ENTITY dactyl.statusBefore "statusbar-display">
 <!ENTITY dactyl.statusAfter "">
+<!ENTITY dactyl.name "melodactyl">
+<!ENTITY dactyl.appName "Melodactyl">
+<!ENTITY dactyl.idName "MELODACTYL">
+<!ENTITY dactyl.fileExt "melo">
+<!ENTITY dactyl.host "&brandShortName;">
+<!ENTITY dactyl.hostbin "songbird">
+
+<!ENTITY dactyl.code "http://code.google.com/p/dactyl/">
+<!ENTITY dactyl.maillist "pentadactyl@googlegroups.com">
+<!ENTITY dactyl.plugins "http://dactyl.sf.net/&dactyl.name;/plugins">
+<!ENTITY dactyl.version "1.0">
 
 <!ENTITY xmlns.dactyl "http://vimperator.org/namespaces/liberator">
 <!ENTITY xmlns.html   "http://www.w3.org/1999/xhtml">
-- 
cgit v1.2.3