Rename -liberator command-line option to -[config-name].

xulmus/components/commandline-handler.js

@@ -7,15 +7,15 @@ function CommandLineHandler()
 
 CommandLineHandler.prototype = {
 
-    classDescription: "Liberator Command-line Handler",
+    classDescription: "Xulmus Command-line Handler",
 
-    classID: Components.ID("{16dc34f7-6d22-4aa4-a67f-2921fb5dcb69}"),
+    classID: Components.ID("{155807a6-02da-4812-981c-e910aa7eba42}"),
 
-    contractID: "@mozilla.org/commandlinehandler/general-startup;1?type=liberator",
+    contractID: "@mozilla.org/commandlinehandler/general-startup;1?type=xulmus",
 
     _xpcom_categories: [{
         category: "command-line-handler",
-        entry: "m-liberator"
+        entry: "m-xulmus"
     }],
 
     QueryInterface: XPCOMUtils.generateQI([Components.interfaces.nsICommandLineHandler]),
@@ -25,11 +25,11 @@ CommandLineHandler.prototype = {
         // TODO: handle remote launches differently?
         try
         {
-            this.optionValue = commandLine.handleFlagWithParam("liberator", false);
+            this.optionValue = commandLine.handleFlagWithParam("xulmus", false);
         }
         catch (e)
         {
-            //"liberator: option -liberator requires an argument"
+            //"xulmus: option -xulmus requires an argument"
         }
     }
 };

xulmus/content/config.js

@@ -196,6 +196,9 @@ const config = { //{{{
 
     init: function ()
     {
+        services.add("commandLineHandler", "@mozilla.org/commandlinehandler/general-startup;1?type=xulmus",
+            Ci.nsICommandLineHandler);
+
         // Adding a mode for Player
         //modes.addMode("PLAYER"); // Player mode for songbird
 

xulmus/locale/en-US/starting.txt

@@ -2,12 +2,12 @@ heading::Starting{nbsp}Xulmus[starting]
 
 |startup-options| +
 
-Command-line options can be passed to Xulmus via the -liberator Firefox
+Command-line options can be passed to Xulmus via the -xulmus Songbird
 option. These are passed as single string argument.
-E.g firefox -liberator "$$++cmd='set exrc' +u='tempRcFile' ++noplugin$$"
+E.g songbird -xulmus "$$++cmd 'set exrc' +u 'tempRcFile' ++noplugin$$"
 
 |+c| +
-||+c={command}||
+||+c {command}||
 ________________________________________________________________________________
 Execute a single Ex command after all initialization has been performed. See
 [j]initialization[j].
@@ -17,7 +17,7 @@ ________________________________________________________________________________
 
 
 |$$++cmd$$| +
-||$$++cmd={command}$$||
+||$$++cmd {command}$$||
 ________________________________________________________________________________
 Execute a single Ex command before any initialization has been performed. See
 [j]initialization[j].
@@ -27,7 +27,7 @@ ________________________________________________________________________________
 
 
 |+u| +
-||+u={rcfile}||
+||+u {rcfile}||
 ________________________________________________________________________________
 The file {rcfile} is used for user initialization commands. If {rcfile} is
 "NORC" then no startup initialization is performed except for the loading of