From b17015449b89d11d44a7f9a29e26be6d4d5beb53 Mon Sep 17 00:00:00 2001
From: "timeless%mac.com" <timeless%mac.com>
Date: Sat, 29 Jul 2006 05:37:37 +0000
Subject: [PATCH] Bugzilla Bug 46596 Address Book should not be in tasks
 menu/component bar if not installed patch by neil@parkwaycc.co.uk r=hwaara
 r=bhuvan sr=blake

---
 suite/common/tasksOverlay.xul                      | 7 -------
 suite/locales/en-US/chrome/common/tasksOverlay.dtd | 4 ----
 2 files changed, 11 deletions(-)

diff --git a/suite/common/tasksOverlay.xul b/suite/common/tasksOverlay.xul
index cb87e8904e22..b7b0de2532c9 100644
--- a/suite/common/tasksOverlay.xul
+++ b/suite/common/tasksOverlay.xul
@@ -20,7 +20,6 @@
 <keyset id="tasksKeys">
   <key id="key_navigator"    key="&navigatorCmd.commandkey;"   command="Tasks:Navigator" modifiers="accel"/>
   <key id="key_editor"       key="&editorCmd.commandkey;"      command="Tasks:Editor" modifiers="accel"/>
-  <key id="key_addressbook"  key="&addressBookCmd.commandkey;" command="Tasks:AddressBook" modifiers="accel"/>
 
   <!-- Tools Menu -->
   <key id="key_gotoHistory"  key="&history.commandKey;"        oncommand="toHistory();" modifiers="accel"/>
@@ -28,7 +27,6 @@
 <commandset id="tasksCommands">
   <command id="Tasks:Navigator" oncommand="toNavigator();"/>
   <command id="Tasks:Editor" oncommand="toEditor();"/>
-  <command id="Tasks:AddressBook" oncommand="toAddressBook();"/>
 </commandset>
 
 
@@ -45,7 +43,6 @@
         <menupopup id="taskPopup">
           <menuitem label="&navigatorCmd.label;" accesskey="&navigatorCmd.accesskey;" key="key_navigator" command="Tasks:Navigator"/>
           <menuitem label="&editorCmd.label;" accesskey="&editorCmd.accesskey;" key="key_editor" command="Tasks:Editor" />
-          <menuitem label="&addressBookCmd.label;" accesskey="&addressBookCmd.accesskey;" key="key_addressbook" command="Tasks:AddressBook"/>
 
           <!-- Overlays get stuffed in here. -->
 
@@ -78,8 +75,6 @@
               tooltip="aTooltip" tooltiptext="&taskNavigator.tooltip;"/>
       <button class="button-toolbar-4 taskbutton" id="mini-comp" oncommand="toEditor();" 
               tooltip="aTooltip" tooltiptext="&taskComposer.tooltip;"/>
-      <button class="button-toolbar-4 taskbutton" id="mini-addr" oncommand="toAddressBook();"
-              tooltip="aTooltip" tooltiptext="&taskAddressBook.tooltip;"/>
     </hbox>
    
     <spring id="taskbar-middle-spacer" flex="10"/>
@@ -106,8 +101,6 @@
               tooltip="aTooltip" tooltiptext="&taskNavigator.tooltip;"/>
       <button class="button-toolbar-4 taskbutton" id="mini-comp" oncommand="toEditor();" 
               tooltip="aTooltip" tooltiptext="&taskComposer.tooltip;"/>
-      <button class="button-toolbar-4 taskbutton" id="mini-addr" oncommand="toAddressBook();"
-              tooltip="aTooltip" tooltiptext="&taskAddressBook.tooltip;"/>
                
    </hbox> 
 </overlay>
diff --git a/suite/locales/en-US/chrome/common/tasksOverlay.dtd b/suite/locales/en-US/chrome/common/tasksOverlay.dtd
index ae7aef41da1d..bcf68bcd67dd 100644
--- a/suite/locales/en-US/chrome/common/tasksOverlay.dtd
+++ b/suite/locales/en-US/chrome/common/tasksOverlay.dtd
@@ -9,9 +9,6 @@
 <!ENTITY editorCmd.label					"Composer">
 <!ENTITY editorCmd.accesskey				"c">
 <!ENTITY editorCmd.commandkey				"4">
-<!ENTITY addressBookCmd.label				"Address Book">  
-<!ENTITY addressBookCmd.accesskey			"a">
-<!ENTITY addressBookCmd.commandkey			"5">
 
 <!ENTITY toolsMenu.label					"Tools"> 
 <!ENTITY toolsMenu.accesskey				"t">
@@ -34,5 +31,4 @@
 
 <!ENTITY taskNavigator.tooltip  "Navigator">
 <!ENTITY taskComposer.tooltip  "Composer">
-<!ENTITY taskAddressBook.tooltip  "Address Book">
 <!ENTITY taskBar.tooltip  "Status Bar">