From a4ad5a8788c2a6974b39d199eb4aebfdfe9b544b Mon Sep 17 00:00:00 2001
From: "mconnor%myrealbox.com"
 <mconnor%myrealbox.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 6 Jul 2004 03:54:41 +0000
Subject: [PATCH] bug 237542 - Firefox should have a Tools > Mail submenu to
 match new toolbar button, patch by Simon Paquet (bugzilla@babylonsounds.com),
 r=me

git-svn-id: svn://10.0.0.236/branches/AVIARY_1_0_20040515_BRANCH@158780 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../browser/base/content/browser-menubar.inc  | 21 +++++++++++++++++++
 .../locales/en-US/chrome/browser/browser.dtd  |  2 ++
 2 files changed, 23 insertions(+)

diff --git a/mozilla/browser/base/content/browser-menubar.inc b/mozilla/browser/base/content/browser-menubar.inc
index 28d0e0103e8..e5ae5deb065 100644
--- a/mozilla/browser/base/content/browser-menubar.inc
+++ b/mozilla/browser/base/content/browser-menubar.inc
@@ -325,6 +325,27 @@
         
           <menu label="&toolsMenu.label;" accesskey="&toolsMenu.accesskey;">
             <menupopup id="menu_ToolsPopup">
+            #ifdef XP_WIN
+              <menu label="&mailMenu.label;"
+                           accesskey="&mailMenu.accesskey;">
+                <menupopup id="viewMailMenu">
+                  <menuitem label="&mailButton.readMail.label;" 
+                                   id="readMailItem"
+                                   accesskey="&mailButton.readMail.accesskey;"
+                                   command="Browser:ReadMail"/>
+                  <menuitem label="&mailButton.newMessage.label;" 
+                                   accesskey="&mailButton.newMessage.accesskey;"
+                                   command="Browser:NewMessage"/>
+                  <menuitem label="&mailButton.sendLink.label;" 
+                                   accesskey="&mailButton.sendLink.accesskey;"
+                                   command="Browser:SendLink"/>
+                  <menuseparator/>
+                  <menuitem label="&mailButton.readNews.label;" 
+                                   accesskey="&mailButton.readNews.accesskey;"
+                                   command="Browser:ReadNews"/>
+                </menupopup>
+              </menu>
+            #endif
               <menuitem label="&search.label;" accesskey="&search.accesskey;" 
                         key="key_search" command="Tools:Search"/>
               <menuseparator/>
diff --git a/mozilla/browser/locales/en-US/chrome/browser/browser.dtd b/mozilla/browser/locales/en-US/chrome/browser/browser.dtd
index 82b8c9152d6..7de2293847b 100644
--- a/mozilla/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/mozilla/browser/locales/en-US/chrome/browser/browser.dtd
@@ -279,6 +279,8 @@
 <!ENTITY historyButton.label            "History">
 <!ENTITY historyButton.tooltip          "Display pages you've viewed recently">
 
+<!ENTITY mailMenu.label                   "Mail &amp; News">
+<!ENTITY mailMenu.accesskey               "M">
 <!ENTITY mailButton.label                 "Mail">
 <!ENTITY mailButton.tooltip               "Read and Send Mail">
 <!ENTITY mailButton.readMail.label        "Read Mail">