Bug 365755 - can't get back to 3-pane window from compose or ab window on mac, r=mscott

mail/base/content/macMenuOverlay.xul

@@ -0,0 +1,58 @@
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is Thunderbird menu code.
+   -
+   - The Initial Developer of the Original Code is
+   -   Phil Ringnalda <philringnalda@gmail.com>.
+   - Portions created by the Initial Developer are Copyright (C) 2007
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<!DOCTYPE overlay SYSTEM "chrome://messenger/locale/messenger.dtd">
+
+<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <menupopup id="windowPopup">
+    <menuseparator insertbefore="sep-window-list"/>
+    <menuitem accesskey="&messengerCmd.accesskey;"
+              label="&messengerCmd.label;"  key="key_mail"
+              oncommand="toMessengerWindow();" id="tasksMenuMail"
+              insertbefore="sep-window-list"/>
+    <menuitem label="&addressBookCmd.label;"
+              accesskey="&addressBookCmd.accesskey;" key="key_addressbook"
+              oncommand="toAddressBook();" id="tasksMenuAddressBook"
+              insertbefore="sep-window-list"/>
+  </menupopup>
+
+  <keyset id="tasksKeys">
+    <key id="key_addressbook" key="&addressBookCmd.commandkey;"
+         oncommand="toAddressBook();" modifiers="accel"/>
+  </keyset>
+
+</overlay>

mail/base/content/mailWindowOverlay.xul

@@ -41,6 +41,9 @@
 
 <?xul-overlay href="chrome://global/content/charsetOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/mailWindowExtrasOverlay.xul"?>
+#ifdef XP_MACOSX
+<?xul-overlay href="chrome://messenger/content/macMenuOverlay.xul"?>
+#endif
 
 <!DOCTYPE overlay [
   <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
@@ -1809,10 +1812,12 @@
     <!-- Tasks -->
     <menu id="tasksMenu" label="&tasksMenu.label;" accesskey="&tasksMenu.accesskey;">
       <menupopup id="taskPopup" onpopupshowing="document.commandDispatcher.updateCommands('create-menu-tasks')">
+#ifndef XP_MACOSX
         <menuitem hidden="true" accesskey="&messengerCmd.accesskey;" label="&messengerCmd.label;" 
                   key="key_mail" oncommand="toMessengerWindow();" id="tasksMenuMail" class="menuitem-iconic menu-iconic"/>
         <menuitem id="addressBook" label="&addressBookCmd.label;" accesskey="&addressBookCmd.accesskey;" key="key_addressbook"
                   oncommand="toOpenWindowByType('mail:addressbook', 'chrome://messenger/content/addressbook/addressbook.xul');"/>
+#endif
         <menuitem id="addonsManager" label="&addons.label;" accesskey="&addons.accesskey;" 
                   oncommand="openAddonsMgr();"/>
         <menuseparator id="devToolsSeparator"/>

mail/base/jar.mn

@@ -114,6 +114,9 @@ messenger.jar:
     content/messenger/mailViewList.js               (/mailnews/extensions/mailviews/resources/content/mailViewList.js)
     content/messenger/am-mdn.xul                    (/mailnews/extensions/mdn/resources/content/am-mdn.xul)
     content/messenger/am-mdn.js                     (/mailnews/extensions/mdn/resources/content/am-mdn.js)
+#ifdef XP_MACOSX
+    content/messenger/macMenuOverlay.xul            (content/macMenuOverlay.xul)
+#endif
 
 comm.jar:
 *+  content/communicator/contentAreaClick.js        (content/contentAreaClick.js)

mail/components/addrbook/content/addressbook.xul

@@ -40,6 +40,10 @@
 
 <?xml-stylesheet href="chrome://messenger/skin/addressbook/addressbook.css" type="text/css"?> 
 
+#ifdef XP_MACOSX
+<?xul-overlay href="chrome://messenger/content/macMenuOverlay.xul"?>
+#endif
+
 <!DOCTYPE window [
 <!ENTITY % abMainWindowDTD SYSTEM "chrome://messenger/locale/addressbook/abMainWindow.dtd" >
 %abMainWindowDTD;

mail/components/compose/content/messengercompose.xul

@@ -42,6 +42,9 @@
 <?xml-stylesheet href="chrome://messenger/skin/messengercompose/messengercompose.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
 <?xul-overlay href="chrome://editor/content/editorOverlay.xul"?>
+#ifdef XP_MACOSX
+<?xul-overlay href="chrome://messenger/content/macMenuOverlay.xul"?>
+#endif
 
 <!DOCTYPE window [
 <!ENTITY % messengercomposeDTD SYSTEM "chrome://messenger/locale/messengercompose/messengercompose.dtd" >