From 30646135f5f05df44bc49df407dd003b4afa5a2f Mon Sep 17 00:00:00 2001
From: "varada%netscape.com"
 <varada%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 21 Oct 2002 23:30:13 +0000
Subject: [PATCH] fix for 20703-get rid of file new menu items-new navigator
 and editor as well as open in new window context menu;sr=mscott

git-svn-id: svn://10.0.0.236/branches/ISHMAIL_1_0_BRANCH@132344 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../resources/content/nsContextMenu.js        |  7 +--
 .../resources/content/utilityOverlay.xul      | 47 -------------------
 2 files changed, 1 insertion(+), 53 deletions(-)

diff --git a/mozilla/xpfe/communicator/resources/content/nsContextMenu.js b/mozilla/xpfe/communicator/resources/content/nsContextMenu.js
index 089830c1add..e5c8ee4d40a 100644
--- a/mozilla/xpfe/communicator/resources/content/nsContextMenu.js
+++ b/mozilla/xpfe/communicator/resources/content/nsContextMenu.js
@@ -80,7 +80,7 @@ nsContextMenu.prototype = {
         this.initMetadataItems();
     },
     initOpenItems : function () {
-        this.showItem( "context-openlink", this.onSaveableLink || ( this.inDirList && this.onLink ) );
+        //this.showItem( "context-openlink", this.onSaveableLink || ( this.inDirList && this.onLink ) );
         this.showItem( "context-openlinkintab", this.onSaveableLink || ( this.inDirList && this.onLink ) );
 
         this.showItem( "context-sep-open", this.onSaveableLink || ( this.inDirList && this.onLink ) );
@@ -430,11 +430,6 @@ nsContextMenu.prototype = {
             return false;
         }
     },
-    // Open linked-to URL in a new window.
-    openLink : function () {
-        // Determine linked-to URL.
-        openNewWindowWith( this.linkURL() );
-    },
     // Open linked-to URL in a new tab.
     openLinkInTab : function () {
         // Determine linked-to URL.
diff --git a/mozilla/xpfe/communicator/resources/content/utilityOverlay.xul b/mozilla/xpfe/communicator/resources/content/utilityOverlay.xul
index 6256c676f48..de848bb2875 100644
--- a/mozilla/xpfe/communicator/resources/content/utilityOverlay.xul
+++ b/mozilla/xpfe/communicator/resources/content/utilityOverlay.xul
@@ -40,58 +40,11 @@
   <menu id="menu_File"
         label="&fileMenu.label;"
         accesskey="&fileMenu.accesskey;"/>
-
-  <!-- New SubMenu (Under File Menu) -->
-  <command id="cmd_newNavigator"
-           oncommand="OpenBrowserWindow()"/>
-  <command id="cmd_newEditor"
-           oncommand="NewEditorWindow();"/>
-
-  <!-- XXX not implemented, temporarily disabled
-  <command id="cmd_newEditorTemplate"
-           disabled="true"
-           oncommand="NewEditorFromTemplate();"/>
-  <command id="cmd_newEditorDraft"
-           disabled="true"
-           oncommand="NewEditorFromDraft();"/>
-  <command id="cmd_pageSetup"
-           disabled="true"
-           oncommand="goPageSetup();"/>
-  -->
-
-  <menuitem id="menu_newEditor"
-            label="&newBlankPageCmd.label;"
-            accesskey="&newBlankPageCmd.accesskey;"
-            key="key_newBlankPage"
-            command="cmd_newEditor"/>
-  <menuitem id="menu_newEditorTemplate"
-            label="&newPageFromTemplateCmd.label;"
-            accesskey="&newPageFromTemplateCmd.accesskey;"
-            command="cmd_newEditorTemplate"/>
-  <menuitem id="menu_newEditorDraft"
-            label="&newPageFromDraftCmd.label;"
-            accesskey="&newPageFromDraftCmd.accesskey;"
-            command="cmd_newEditorDraft"/>
  
   <menu id="menu_New"
         label="&newMenu.label;"
         accesskey="&newMenu.accesskey;"/>
 
-  <menuitem id="menu_newNavigator"
-            label="&newNavigatorCmd.label;"
-            accesskey="&newNavigatorCmd.accesskey;"
-            key="key_newNavigator"
-            command="cmd_newNavigator"/>
-
-  <key id="key_newBlankPage"
-       key="&newBlankPageCmd.key;"
-       command="cmd_newEditor"
-       modifiers="accel, shift"/>
-  <key id="key_newNavigator"
-       key="&newNavigatorCmd.key;"
-       command="cmd_newNavigator"
-       modifiers="accel"/>
-
   <!-- Edit Menu -->
   <menu id="menu_Edit"
         label="&editMenu.label;"