From 76df81063dbb3e0d3762580dc158782c6081d873 Mon Sep 17 00:00:00 2001
From: Justin Wood <Callek@gmail.com>
Date: Tue, 8 Jul 2008 01:00:09 -0400
Subject: [PATCH] Bug 279144 Make Editor reuse utilityOverlay status bar toggle
 code r=IanN,philor [p=Neil] (from) Bug 443837 - Get SeaMonkey/Thunderbird
 patches from cvs trunk into mozilla-central

---
 editor/ui/composer/content/editor.xul              | 2 +-
 editor/ui/composer/content/editorOverlay.xul       | 1 -
 editor/ui/locales/en-US/chrome/composer/editor.dtd | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/editor/ui/composer/content/editor.xul b/editor/ui/composer/content/editor.xul
index 2c9ee3c8723..87d1f4bca54 100644
--- a/editor/ui/composer/content/editor.xul
+++ b/editor/ui/composer/content/editor.xul
@@ -146,7 +146,7 @@
           <menuitem id="viewComposerToolbar" label="&compositionToolbarCmd.label;" type="checkbox" accesskey="&compositiontb.accesskey;" command="cmd_viewCompToolbar"  />
           <menuitem id="viewFormatToolbar"   label="&formattingToolbarCmd.label;"  type="checkbox" accesskey="&formattingtb.accesskey;"  command="cmd_viewFormatToolbar" />
           <menuitem id="viewEditModeToolbar" label="&editmodeToolbarCmd.label;"    type="checkbox" accesskey="&editmodetb.accesskey;"    command="cmd_viewEditModeToolbar" />
-          <menuitem id="viewTaskBar"         label="&taskbarCmd.label;"            type="checkbox" accesskey="&taskbarCmd.accesskey;"    command="cmd_viewtaskbar" />
+          <menuitem id="menu_showTaskbar"/>
         </menupopup>
       </menu>
       <menuseparator id="viewSep1"/>
diff --git a/editor/ui/composer/content/editorOverlay.xul b/editor/ui/composer/content/editorOverlay.xul
index aa581424b04..e7ace0ab37e 100644
--- a/editor/ui/composer/content/editorOverlay.xul
+++ b/editor/ui/composer/content/editorOverlay.xul
@@ -324,7 +324,6 @@
     <command id="cmd_viewCompToolbar"     oncommand="goToggleToolbar('EditToolbar','cmd_viewCompToolbar');"         checked="true"/>
     <command id="cmd_viewFormatToolbar"   oncommand="goToggleToolbar('FormatToolbar','cmd_viewFormatToolbar');"     checked="true"/>
     <command id="cmd_viewEditModeToolbar" oncommand="goToggleToolbar('EditModeToolbar','cmd_viewEditModeToolbar');" checked="true"/>
-    <command id="cmd_viewtaskbar"         oncommand="goToggleToolbar('status-bar','cmd_viewtaskbar');"              checked="true"/>
 
     <!-- Obsolete; these will go away -->
     <command id="Editor:Font:Size" fontsize=""/>
diff --git a/editor/ui/locales/en-US/chrome/composer/editor.dtd b/editor/ui/locales/en-US/chrome/composer/editor.dtd
index 2433a38308e..77a8adbff43 100644
--- a/editor/ui/locales/en-US/chrome/composer/editor.dtd
+++ b/editor/ui/locales/en-US/chrome/composer/editor.dtd
@@ -51,8 +51,6 @@
 <!ENTITY formattingtb.accesskey "f">
 <!ENTITY editmodeToolbarCmd.label "Edit Mode Toolbar">
 <!ENTITY editmodetb.accesskey "E">
-<!ENTITY taskbarCmd.label "Status Bar">
-<!ENTITY taskbarCmd.accesskey "S">
 
 <!-- Format menu items -->
 <!ENTITY formatMenu.label "Format">