From 93738fdb510f6d81618a9ca55f4de0310b2c6b72 Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org" <scott%scott-macgregor.org>
Date: Thu, 6 Nov 2003 18:31:39 +0000
Subject: [PATCH] Bug #224380 --> some items in message menu should be disabled
 if no messages are selected

thanks to mbr for the fix

r=bienvenu
sr=mscott
---
 .../base/resources/content/mailWindowOverlay.js | 17 +++++++++++++++++
 .../resources/content/mailWindowOverlay.xul     |  6 +++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/mailnews/base/resources/content/mailWindowOverlay.js b/mailnews/base/resources/content/mailWindowOverlay.js
index f8f77a9ff292..c59bfa1b10c6 100644
--- a/mailnews/base/resources/content/mailWindowOverlay.js
+++ b/mailnews/base/resources/content/mailWindowOverlay.js
@@ -387,6 +387,23 @@ function InitMessageMenu()
   if(copyMenu)
       copyMenu.setAttribute("disabled", !aMessage);
 
+  // Disable Forward as/Label menu items if no message is selected
+  var forwardAsMenu = document.getElementById("forwardAsMenu");
+  if(forwardAsMenu)
+      forwardAsMenu.setAttribute("disabled", !aMessage);
+
+  var labelMenu = document.getElementById("labelMenu");
+  if(labelMenu)
+      labelMenu.setAttribute("disabled", !aMessage);
+
+  // Disable mark menu when we're not in a folder
+  var markMenu = document.getElementById("markMenu");
+  if(markMenu)
+  {
+      var msgFolder = GetLoadedMsgFolder();
+      markMenu.setAttribute("disabled", !msgFolder);
+  }
+
   document.commandDispatcher.updateCommands('create-menu-message');
 }
 
diff --git a/mailnews/base/resources/content/mailWindowOverlay.xul b/mailnews/base/resources/content/mailWindowOverlay.xul
index 9c090b0a6f23..30b0eee01782 100644
--- a/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -1316,7 +1316,7 @@ Rights Reserved.
       accesskey="&forwardMsgCmd.accesskey;"
       key="key_forward"
       observes="cmd_forward"/>
-    <menu label="&forwardAsMenu.label;" accesskey="&forwardAsMenu.accesskey;">
+    <menu id="forwardAsMenu" label="&forwardAsMenu.label;" accesskey="&forwardAsMenu.accesskey;">
       <menupopup>
         <menuitem label="&forwardAsInline.label;" accesskey="&forwardAsInline.accesskey;" observes="cmd_forwardInline"/>
         <menuitem label="&forwardAsAttachmentCmd.label;" accesskey="&forwardAsAttachmentCmd.accesskey;" observes="cmd_forwardAttachment"/>
@@ -1458,7 +1458,7 @@ Rights Reserved.
         </rule>
       </template>
     </menu>
-    <menu label="&labelMenu.label;" accesskey="&labelMenu.accesskey;">
+    <menu id="labelMenu" label="&labelMenu.label;" accesskey="&labelMenu.accesskey;">
       <menupopup id="menuPopup-labels" onpopupshowing="InitMessageLabel('menuPopup')">
         <menuitem
            id="menuPopup-labelMenuItem0"
@@ -1499,7 +1499,7 @@ Rights Reserved.
            observes="cmd_label5"/>
       </menupopup>
     </menu>
-    <menu label="&markMenu.label;" accesskey="&markMenu.accesskey;">
+    <menu id="markMenu" label="&markMenu.label;" accesskey="&markMenu.accesskey;">
       <menupopup onpopupshowing="InitMessageMark()">
         <menuitem id="markReadMenuItem"
                   type="checkbox"