From 30bc7a2891b2dc3d01ec2995ddd2b7ce13d35718 Mon Sep 17 00:00:00 2001
From: "bzbarsky%mit.edu"
 <bzbarsky%mit.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 16 Apr 2002 04:14:49 +0000
Subject: [PATCH] Fix the "Close" menuitem and keyboard shortcut in Inspector. 
 r=hwaara, sr=hewitt.

git-svn-id: svn://10.0.0.236/trunk@119072 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/extensions/inspector/resources/content/inspector.xul  | 4 +++-
 .../extensions/inspector/resources/content/popupOverlay.xul   | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/mozilla/extensions/inspector/resources/content/inspector.xul b/mozilla/extensions/inspector/resources/content/inspector.xul
index 2948f9a78ca..8c547cefe7d 100644
--- a/mozilla/extensions/inspector/resources/content/inspector.xul
+++ b/mozilla/extensions/inspector/resources/content/inspector.xul
@@ -3,6 +3,7 @@
 <!DOCTYPE overlay [
   <!ENTITY % dtd1 SYSTEM "chrome://inspector/locale/inspector.dtd"> %dtd1;
   <!ENTITY % dtd2 SYSTEM "chrome://inspector/content/util.dtd"> %dtd2;
+  <!ENTITY % dtd3 SYSTEM "chrome://communicator-platform/locale/platformCommunicatorOverlay.dtd"> %dtd3;
 ]>
 
 <?xul-overlay href="chrome://inspector/content/inspectorOverlay.xul"?>
@@ -36,7 +37,8 @@
   </commandset>
   
   <keyset id="tasksKeys">
-    <key id="key_close"/>
+    <key id="key_closeInspector" key="&closeCmd.key;" command="cmdClose"
+         modifiers="accel"/>
     <key id="key_quit"/>
   </keyset>
 
diff --git a/mozilla/extensions/inspector/resources/content/popupOverlay.xul b/mozilla/extensions/inspector/resources/content/popupOverlay.xul
index b202c6cf68d..e09985c2b51 100644
--- a/mozilla/extensions/inspector/resources/content/popupOverlay.xul
+++ b/mozilla/extensions/inspector/resources/content/popupOverlay.xul
@@ -43,7 +43,8 @@
     <menuitem label="&cmdShowOpenURLDialog.label;" accesskey="&cmdShowOpenURLDialog.accesskey;"
               observes="cmdShowOpenURLDialog"/>
     <menuseparator/>
-    <menuitem id="menu_close"/>
+    <menuitem label="&cmdClose.label;" accesskey="&cmdClose.accesskey;" 
+              observes="cmdClose" key="key_closeInspector"/>
   </menupopup>
 
   <menupopup id="mppEdit">