From 0c8b33abd6679f8690f54bdcdf50b1225d6d3e2d Mon Sep 17 00:00:00 2001
From: "rob_strong%exchangecode.com" <rob_strong%exchangecode.com>
Date: Thu, 1 Sep 2005 20:48:14 +0000
Subject: [PATCH] Remove Theme ->Show Item Contents (including strings) from
 extension and theme managers. Bug 306182 Theme ->Show Item Contents throws
 exception (in [nsILocalFile.reveal]). r=bsmedberg, a=asa

---
 .../chrome/mozapps/extensions/extensions.dtd    |  2 --
 .../mozapps/extensions/content/extensions.js    | 17 ++---------------
 .../mozapps/extensions/content/extensions.xul   |  4 ----
 3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
index f45b93b0edc6..9bdb166b743a 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
@@ -42,8 +42,6 @@
 <!ENTITY cmd.moveUp.accesskey             "p">
 <!ENTITY cmd.moveDn.label                 "Move Down">
 <!ENTITY cmd.moveDn.accesskey             "w">
-<!ENTITY cmd.showFolder.label             "Show Item Contents...">
-<!ENTITY cmd.showFolder.accesskey         "C">
 
 <!-- Extension Items -->
 <!ENTITY options.tooltip                  "Options">
diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js
index c1cde8256bf4..13aa8ae53366 100644
--- a/toolkit/mozapps/extensions/content/extensions.js
+++ b/toolkit/mozapps/extensions/content/extensions.js
@@ -649,11 +649,10 @@ function onThemeSelect(aEvent)
 var gExtensionContextMenus = ["menuitem_options", "menuitem_homepage", "menuitem_about", 
                               "menuseparator_1", "menuitem_uninstall", "menuitem_update",
                               "menuitem_enable", "menuitem_disable", "menuseparator_2", 
-                              "menuitem_moveTop", "menuitem_moveUp", "menuitem_moveDn",
-                              "menuseparator_3", "menuitem_showFolder"];
+                              "menuitem_moveTop", "menuitem_moveUp", "menuitem_moveDn"];
 var gThemeContextMenus = ["menuitem_useTheme", "menuitem_homepage", "menuitem_about", 
                           "menuseparator_1", "menuitem_uninstall", "menuitem_update",
-                          "menuitem_enable", "menuseparator_3", "menuitem_showFolder"];
+                          "menuitem_enable"];
 
 function buildContextMenu(aEvent)
 {
@@ -928,9 +927,6 @@ var gExtensionsViewController = {
     case "cmd_movedn":
       var children = gExtensionsView.children;
       return selectedItem && (children[children.length-1] != selectedItem);
-    case "cmd_showFolder":
-      return selectedItem && 
-             opType != OP_NEEDS_INSTALL;
 #ifndef MOZ_PHOENIX
     case "cmd_install":
       return true;   
@@ -1109,15 +1105,6 @@ var gExtensionsViewController = {
 
     },
 
-    cmd_showFolder: function (aSelectedItem)
-    {
-      var id = getIDFromResourceURI(aSelectedItem.id);
-      var installLocation = gExtensionManager.getInstallLocation(id);
-      var location = installLocation.getItemLocation(id);
-      if (location instanceof Components.interfaces.nsILocalFile)
-        location.reveal();
-    },
-    
     cmd_disable: function (aSelectedItem)
     {
       gExtensionManager.disableItem(getIDFromResourceURI(aSelectedItem.id));
diff --git a/toolkit/mozapps/extensions/content/extensions.xul b/toolkit/mozapps/extensions/content/extensions.xul
index a0a7889160ac..5e357e8bc1f1 100644
--- a/toolkit/mozapps/extensions/content/extensions.xul
+++ b/toolkit/mozapps/extensions/content/extensions.xul
@@ -101,7 +101,6 @@
     <command id="cmd_moveup"/>
     <command id="cmd_movedn"/>
     <command id="cmd_useTheme"/>
-    <command id="cmd_showFolder"/>
   </commandset>
   
   <vbox id="contextMenuPalette" hidden="true">
@@ -133,9 +132,6 @@
               label="&cmd.moveUp.label;" accesskey="&cmd.moveUp.accesskey;"/>
     <menuitem id="menuitem_moveDn" command="cmd_movedn"
               label="&cmd.moveDn.label;" accesskey="&cmd.moveDn.accesskey;"/>
-    <menuseparator id="menuseparator_3"/>
-    <menuitem id="menuitem_showFolder" command="cmd_showFolder"
-              label="&cmd.showFolder.label;" accesskey="&cmd.showFolder.accesskey;"/>
   </vbox>
 
   <popup id="extensionContextMenu" onpopupshowing="return buildContextMenu(event);"/>