From 04647c4abb9f4a9a056a9e9830e422e8722e04a1 Mon Sep 17 00:00:00 2001
From: Przemyslaw Bialik <firefox@poczta.neostrada.pl>
Date: Sun, 15 Feb 2009 16:13:59 +0100
Subject: [PATCH] Bug 466019 - allow switching to tabs in new tabbed interface
 (via ctrl+tab number); rev3.1 - missing part; r=mkmelin+mozilla

---
 mail/base/content/macMenuOverlay.xul                       | 7 ++++---
 mail/base/content/mailWindowOverlay.xul                    | 4 +++-
 mail/components/compose/content/messengercompose.xul       | 7 +++++--
 .../chrome/messenger/messengercompose/messengercompose.dtd | 1 -
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/mail/base/content/macMenuOverlay.xul b/mail/base/content/macMenuOverlay.xul
index d291655bdf..1188c014bc 100644
--- a/mail/base/content/macMenuOverlay.xul
+++ b/mail/base/content/macMenuOverlay.xul
@@ -50,9 +50,10 @@
               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"
+    <menuitem id="tasksMenuAddressBook"
+              label="&addressBookCmd.label;"
+              accesskey="&addressBookCmd.accesskey;"
+              oncommand="toAddressBook();"
               insertbefore="sep-window-list"/>
   </menupopup>
 </overlay>
diff --git a/mail/base/content/mailWindowOverlay.xul b/mail/base/content/mailWindowOverlay.xul
index f7bf4b4a6c..ea953f48d6 100644
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -1305,7 +1305,9 @@
 #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"
+        <menuitem id="addressBook"
+                  label="&addressBookCmd.label;"
+                  accesskey="&addressBookCmd.accesskey;"
                   oncommand="toOpenWindowByType('mail:addressbook', 'chrome://messenger/content/addressbook/addressbook.xul');"/>
 #endif
         <menuitem id="addonsManager" label="&addons.label;" accesskey="&addons.accesskey;"
diff --git a/mail/components/compose/content/messengercompose.xul b/mail/components/compose/content/messengercompose.xul
index 26b821b7be..48e67e99c0 100644
--- a/mail/components/compose/content/messengercompose.xul
+++ b/mail/components/compose/content/messengercompose.xul
@@ -233,7 +233,6 @@
 
    <!-- Tools Menu -->
   <key id="key_mail"  key="&messengerCmd.commandkey;" oncommand="toMessengerWindow();" modifiers="accel"/>
-  <key id="key_addressbook"  key="&addressBookCmd.commandkey;" oncommand="toAddressBook();" modifiers="accel"/>
 
   <!-- Tab/F6 Keys -->
   <key keycode="VK_TAB" oncommand="SwitchElementFocus(event);" modifiers="control"/>
@@ -487,7 +486,11 @@
             <!-- Moving the first two items to the Window menu on the Mac -->
 #ifndef XP_MACOSX
             <menuitem accesskey="&messengerCmd.accesskey;" label="&messengerCmd.label;"  key="key_mail" oncommand="toMessengerWindow();" id="tasksMenuMail" class="menuitem-iconic icon-mail16 menu-iconic"/>
-            <menuitem label="&addressBookCmd.label;" accesskey="&addressBookCmd.accesskey;" key="key_addressbook" oncommand="toAddressBook();" id="tasksMenuAddressBook" class="menuitem-iconic icon-addressbook16 menu-iconic"/>
+            <menuitem id="tasksMenuAddressBook"
+                      label="&addressBookCmd.label;"
+                      accesskey="&addressBookCmd.accesskey;"
+                      oncommand="toAddressBook();"
+                      class="menuitem-iconic icon-addressbook16 menu-iconic"/>
 #endif
 
 #ifndef XP_UNIX
diff --git a/mail/locales/en-US/chrome/messenger/messengercompose/messengercompose.dtd b/mail/locales/en-US/chrome/messenger/messengercompose/messengercompose.dtd
index c569cbc49f..0dbe968026 100644
--- a/mail/locales/en-US/chrome/messenger/messengercompose/messengercompose.dtd
+++ b/mail/locales/en-US/chrome/messenger/messengercompose/messengercompose.dtd
@@ -162,7 +162,6 @@
 <!ENTITY messengerCmd.commandkey "1">
 <!ENTITY addressBookCmd.label "Address Book">
 <!ENTITY addressBookCmd.accesskey "a">
-<!ENTITY addressBookCmd.commandkey "2">
 <!ENTITY accountManagerCmd.label "Account Settings…">
 <!ENTITY accountManagerCmd.accesskey "c">
 <!ENTITY accountManagerCmdUnix.accesskey "S">