From 8c5e020dae68a540de85ba80f0827319f1e3bf44 Mon Sep 17 00:00:00 2001
From: "mostafah%oeone.com" <mostafah%oeone.com>
Date: Fri, 10 Oct 2003 21:09:28 +0000
Subject: [PATCH] Removed dependency on tasksOverlay.xul to make calendar
 available to thunderbird

---
 calendar/resources/content/menuOverlay.xul    | 27 +++++--------------
 .../resources/locale/en-US/menuOverlay.dtd    |  5 ++++
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/calendar/resources/content/menuOverlay.xul b/calendar/resources/content/menuOverlay.xul
index 35b3920bd5c..5333aadd6b3 100644
--- a/calendar/resources/content/menuOverlay.xul
+++ b/calendar/resources/content/menuOverlay.xul
@@ -40,12 +40,10 @@
 
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/charsetOverlay.xul"?>
 
 <!DOCTYPE overlay 
 [
-	<!ENTITY % navigatorDTD SYSTEM "chrome://navigator/locale/navigator.dtd" > %navigatorDTD;
    <!ENTITY % calendarDTD SYSTEM "chrome://calendar/locale/calendar.dtd" > %calendarDTD;
 	<!ENTITY % calendarMenuOverlayDTD SYSTEM "chrome://calendar/locale/menuOverlay.dtd" > %calendarMenuOverlayDTD;
 ]>
@@ -87,15 +85,6 @@
     <key id="key_delete"/>
     <key id="key_selectAll"/>
   
-    <!-- Search Menu -->  
-    <key id="key_find"
-         key="&findOnCmd.commandkey;"
-         command="Browser:Find"
-         modifiers="accel"/>
-    <key id="key_findAgain"
-         key="&findAgainCmd.commandkey;"
-         command="Browser:FindAgain"
-         modifiers="accel"/>
   </keyset>
   <keyset id="tasksKeys">
       <key id="key_quit"/>
@@ -276,7 +265,9 @@
       </menupopup>
    </menu>
    
-   <menu id="tasksMenu">
+   <menu id="tasksMenu"
+         label="&taskMenu.label;"
+         accesskey="&taskMenu.accesskey;" >                                                                                       
       <menupopup id="taskPopup">
          <menuitem id="calendar-wizard-menu"
                    key="wizard_key"
@@ -301,17 +292,13 @@
                    label="&calendar.publish.label;"
                    accesskey="&calendar.publish.accesskey;"
                    observes="publish_events_command"/>
-         <menuseparator/>
       </menupopup>
    </menu>
-   
-   <menu id="windowMenu"/>
-  
-   <menu accesskey="&helpMenuCmd.accesskey;"
-         id="menu_Help">
+
+   <menu id="menu_Help"
+         accesskey="&helpMenu.accesskey;"
+         >
       <menupopup id="helpPopup">
-         <menuitem id="releaseUrl"/>
-         <menuseparator id="menu_HelpAboutSeparator"/>
          <menuitem id="calendar-about-menu-item"
                    label="&calendar.about.label;"
                    accesskey="&calendar.about.accesskey;"
diff --git a/calendar/resources/locale/en-US/menuOverlay.dtd b/calendar/resources/locale/en-US/menuOverlay.dtd
index d6b973145cb..b26da2f782f 100644
--- a/calendar/resources/locale/en-US/menuOverlay.dtd
+++ b/calendar/resources/locale/en-US/menuOverlay.dtd
@@ -114,3 +114,8 @@
 
 <!ENTITY goNextCmd.label                "Next">
 <!ENTITY goNextCmd.accesskey            "N">
+
+<!ENTITY taskMenu.label                "Tools">
+<!ENTITY taskMenu.accesskey            "T">
+
+<!ENTITY helpMenu.accesskey            "H">