From 98406ff211bfac968975b1acddc28792d82fb3f7 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Wed, 25 Mar 2009 04:03:10 +1100
Subject: [PATCH] Fix :dialog entries.

---
 xulmus/content/config.js | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/xulmus/content/config.js b/xulmus/content/config.js
index 45bb0c51..5eed716e 100755
--- a/xulmus/content/config.js
+++ b/xulmus/content/config.js
@@ -63,45 +63,58 @@ const config = { //{{{
                    ["XulmusLeavePre", "Triggered before exiting Xulmus, just before destroying each module"],
                    ["XulmusLeave",    "Triggered before exiting Xulmus"]],
 
+    // TODO: remove those which don't make sense, can't be provided.
     dialogs: [
         ["about",            "About Songbird",
-            function () { window.openDialog("chrome://browser/content/aboutDialog.xul", "_blank", "chrome,dialog,modal,centerscreen"); }],
+            function () { window.openDialog("chrome://songbird/content/xul/about.xul", "_blank", "chrome,dialog,modal,centerscreen"); }],
+        /*
         ["addbookmark",      "Add bookmark for the current page",
             function () { PlacesCommandHook.bookmarkCurrentPage(true, PlacesUtils.bookmarksRootId); }],
+        */
         ["addons",           "Manage Add-ons",
-            function () { window.BrowserOpenAddonsMgr(); }],
+            function () { SBOpenPreferences("paneAddons"); }],
+        /*
         ["bookmarks",        "List your bookmarks",
             function () { window.openDialog("chrome://browser/content/bookmarks/bookmarksPanel.xul", "Bookmarks", "dialog,centerscreen,width=600,height=600"); }],
+        */
         ["checkupdates",     "Check for updates",
             function () { window.checkForUpdates(); }],
         ["cleardata",        "Clear private data",
-            function () { Cc[GLUE_CID].getService(Ci.nsIBrowserGlue).sanitize(window || null); }],
+            function () {  Sanitizer.showUI(); }],
         ["cookies",          "List your cookies",
             function () { window.toOpenWindowByType("Browser:Cookies", "chrome://browser/content/preferences/cookies.xul", "chrome,dialog=no,resizable"); }],
         ["console",          "JavaScript console",
             function () { window.toJavaScriptConsole(); }],
+        /*
         ["customizetoolbar", "Customize the Toolbar",
             function () { window.BrowserCustomizeToolbar(); }],
+        */
         ["dominspector",     "DOM Inspector",
             function () { try { window.inspectDOMDocument(content.document); } catch (e) { liberator.echoerr("DOM Inspector extension not installed"); } }],
         ["downloads",        "Manage Downloads",
             function () { window.toOpenWindowByType("Download:Manager", "chrome://mozapps/content/downloads/downloads.xul", "chrome,dialog=no,resizable"); }],
+        /*
         ["history",          "List your history",
             function () { window.openDialog("chrome://browser/content/history/history-panel.xul", "History", "dialog,centerscreen,width=600,height=600"); }],
         ["import",           "Import Preferences, Bookmarks, History, etc. from other browsers",
             function () { window.BrowserImport(); }],
+        */
         ["openfile",         "Open the file selector dialog",
-            function () { window.BrowserOpenFileWindow(); }],
+            function () { SBFileOpen(); }],
+        /*
         ["pageinfo",         "Show information about the current page",
             function () { window.BrowserPageInfo(); }],
+        */
         ["pagesource",       "View page source",
             function () { window.BrowserViewSourceOfDocument(content.document); }],
         ["places",           "Places Organizer: Manage your bookmarks and history",
             function () { PlacesCommandHook.showPlacesOrganizer(ORGANIZER_ROOT_BOOKMARKS); }],
         ["preferences",      "Show Firefox preferences dialog",
             function () { window.openPreferences(); }],
+        /*
         ["printpreview",     "Preview the page before printing",
             function () { PrintUtils.printPreview(onEnterPrintPreview, onExitPrintPreview); }],
+        */
         ["printsetup",       "Setup the page size and orientation before printing",
             function () { PrintUtils.showPageSetup(); }],
         ["print",            "Show print dialog",
@@ -382,6 +395,8 @@ const config = { //{{{
             },
             { argCount: "0" });
 
+        // TODO: service/content pane and right sidebar manipulation commands? --djk
+        /*
         // TODO: move sidebar commands to ui.js?
         commands.add(["sbcl[ose]"],
             "Close the sidebar window",
@@ -423,6 +438,7 @@ const config = { //{{{
                 completer: function (context) completion.sidebar(context),
                 literal: 0
             });
+        */
 
         commands.add(["winc[lose]", "wc[lose]"],
             "Close window",