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

mailnews/base/resources/content/mailTasksOverlay.xul

@@ -50,21 +50,26 @@
 
   <keyset id="tasksKeys">
     <key id="key_mail"  key="&messengerCmd.commandkey;" command="Tasks:Mail" modifiers="accel"/>
+    <key id="key_addressbook"  key="&addressBookCmd.commandkey;" command="Tasks:AddressBook" modifiers="accel"/>
   </keyset>
 
 
   <commandset id="tasksCommands">
     <command id="Tasks:Mail" oncommand="toMessengerWindow();"/>
+    <command id="Tasks:AddressBook" oncommand="toAddressBook();"/>
   </commandset>
   
 
   <hbox id="component-bar" class="statusbar-panel" persist="collapsed">
     <button class="button-toolbar-4 taskbutton" id="mini-mail" oncommand="toMessengerWindow()" 
             position="2" tooltip="aTooltip" tooltiptext="&taskMessenger.tooltip;"/>
+    <button class="button-toolbar-4 taskbutton" id="mini-addr" oncommand="toAddressBook();"
+            position="4" tooltip="aTooltip" tooltiptext="&taskAddressBook.tooltip;"/>
   </hbox>
   
   <menupopup id="taskPopup">
     <menuitem position="2" accesskey="&messengerCmd.accesskey;" label="&messengerCmd.label;"  key="key_mail" command="Tasks:Mail"/>
+    <menuitem position="4" label="&addressBookCmd.label;" accesskey="&addressBookCmd.accesskey;" key="key_addressbook" command="Tasks:AddressBook"/>
   </menupopup>
   
 </overlay>         

mailnews/base/resources/locale/en-US/mailTasksOverlay.dtd

@@ -3,6 +3,10 @@
 <!ENTITY messengerCmd.label					"Mail">
 <!ENTITY messengerCmd.accesskey				"m">
 <!ENTITY messengerCmd.commandkey			"2">
+<!ENTITY addressBookCmd.label				"Address Book">  
+<!ENTITY addressBookCmd.accesskey			"a">
+<!ENTITY addressBookCmd.commandkey			"5">
 
 <!ENTITY taskMessenger.tooltip  "Mail">
+<!ENTITY taskAddressBook.tooltip  "Address Book">
 

xpfe/communicator/resources/content/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>

xpfe/communicator/resources/locale/en-US/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">