From 87684653817ff7b4023df5aba55bb7c44de7ce99 Mon Sep 17 00:00:00 2001
From: "ssu%netscape.com" <ssu%netscape.com>
Date: Tue, 8 Jan 2002 06:02:24 +0000
Subject: [PATCH] fixing bug 114623 - two separators in right-click on url
 r=racham sr=mscott

---
 mailnews/base/resources/content/mailContextMenus.js  |  9 +++++++++
 .../base/resources/content/mailWindowOverlay.xul     | 12 ++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/mailnews/base/resources/content/mailContextMenus.js b/mailnews/base/resources/content/mailContextMenus.js
index 6424702d64ad..467a46b47eea 100644
--- a/mailnews/base/resources/content/mailContextMenus.js
+++ b/mailnews/base/resources/content/mailContextMenus.js
@@ -126,6 +126,12 @@ function SetupCopyMenuItem(menuID, numSelected, forceHide)
   EnableMenuItem(menuID, (numSelected > 0));
 }
 
+function SetupLabelsMenuItem(menuID, numSelected, forceHide)
+{
+  ShowMenuItem(menuID, (numSelected <= 1) && !forceHide);
+  EnableMenuItem(menuID, (numSelected == 1));
+}
+
 function SetupSaveAsMenuItem(menuID, numSelected, forceHide)
 {
   ShowMenuItem(menuID, (numSelected <= 1) && !forceHide);
@@ -357,6 +363,7 @@ function fillMessagePaneContextMenu()
   SetupCopyMessageUrlMenuItem("messagePaneContext-copyMessageUrl", numSelected, isNewsgroup, (numSelected == 0 || hideMailItems)); 
   SetupCopyMenuItem("messagePaneContext-copyMenu", numSelected, (numSelected == 0 || hideMailItems));
   SetupMoveMenuItem("messagePaneContext-moveMenu", numSelected, isNewsgroup, (numSelected == 0 || hideMailItems));
+  SetupLabelsMenuItem("messagePaneContext-labels", numSelected, (numSelected == 0 || hideMailItems));
   SetupSaveAsMenuItem("messagePaneContext-saveAs", numSelected, (numSelected == 0 || hideMailItems));
   SetupPrintMenuItem("messagePaneContext-print", numSelected, (numSelected == 0 || hideMailItems));
   SetupDeleteMenuItem("messagePaneContext-delete", numSelected, isNewsgroup, (numSelected == 0 || hideMailItems));
@@ -370,6 +377,8 @@ function fillMessagePaneContextMenu()
   ShowMenuItem("messagePaneContext-sep-link", ShowSeparator("messagePaneContext-sep-link"));
   ShowMenuItem("messagePaneContext-sep-image", ShowSeparator("messagePaneContext-sep-image"));
   ShowMenuItem("messagePaneContext-sep-copy", ShowSeparator("messagePaneContext-sep-copy"));
+  ShowMenuItem("messagePaneContext-sep-labels-1", ShowSeparator("messagePaneContext-sep-labels-1"));
+  ShowMenuItem("messagePaneContext-sep-labels-2", ShowSeparator("messagePaneContext-sep-labels-2"));
   
   if (!hideMailItems)
     ShowMenuItem("messagePaneContext-sep-edit", false);
diff --git a/mailnews/base/resources/content/mailWindowOverlay.xul b/mailnews/base/resources/content/mailWindowOverlay.xul
index 8dac5dd1735f..cd64baca5ada 100644
--- a/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -488,8 +488,8 @@ Rights Reserved.
       </template>
     </menu>
     <menuseparator/>
-    <menu label="&labelMenu.label;" accesskey="&labelMenu.accesskey;">
-      <menupopup id="threadPaneContext-labels" onpopupshowing="InitMessageLabel('threadPaneContext')">
+    <menu id="threadPaneContext-labels" label="&labelMenu.label;" accesskey="&labelMenu.accesskey;">
+      <menupopup onpopupshowing="InitMessageLabel('threadPaneContext')">
         <menuitem
            id="threadPaneContext-labelMenuItem0"
            accesskey="&labelCmd0.accesskey;"
@@ -767,9 +767,9 @@ Rights Reserved.
         </rule>
       </template>
     </menu>
-    <menuseparator/>
-    <menu label="&labelMenu.label;" accesskey="&labelMenu.accesskey;">
-      <menupopup id="messagePaneContext-labels" onpopupshowing="InitMessageLabel('messagePaneContext')">
+    <menuseparator id="messagePaneContext-sep-labels-1"/>
+    <menu id="messagePaneContext-labels" label="&labelMenu.label;" accesskey="&labelMenu.accesskey;">
+      <menupopup onpopupshowing="InitMessageLabel('messagePaneContext')">
         <menuitem
            id="messagePaneContext-labelMenuItem0"
            accesskey="&labelCmd0.accesskey;"
@@ -797,7 +797,7 @@ Rights Reserved.
            observes="cmd_label5"/>
       </menupopup>
     </menu>
-    <menuseparator/>
+    <menuseparator id="messagePaneContext-sep-labels-2"/>
     <menuitem id="messagePaneContext-saveAs"
         label="&contextSaveAs.label;"
         accesskey="&contextSaveAs.accesskey;"