From fef45d9b26fc6bef820ff1c19a02a4cae30fe1ed Mon Sep 17 00:00:00 2001
From: "rob_strong%exchangecode.com"
 <rob_strong%exchangecode.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 24 Aug 2005 21:12:53 +0000
Subject: [PATCH] Bug 305361 install-global-extension and install-global-theme
 work inconsistently. r=mconnor, a=asa

git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@178856 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../browser/components/preferences/advanced.js | 18 ------------------
 .../components/preferences/advanced.xul        |  4 ----
 .../chrome/browser/preferences/advanced.dtd    |  1 -
 3 files changed, 23 deletions(-)

diff --git a/mozilla/browser/components/preferences/advanced.js b/mozilla/browser/components/preferences/advanced.js
index 5064023afe5..52f34ee6394 100644
--- a/mozilla/browser/components/preferences/advanced.js
+++ b/mozilla/browser/components/preferences/advanced.js
@@ -199,24 +199,6 @@ var gAdvancedPane = {
     return !warnIncompatible.checked ? 0 : gAdvancedPane._modePreference;
   },
   
-  checkForAddonUpdates: function ()
-  {
-    var wm = 
-        Components.classes["@mozilla.org/appshell/window-mediator;1"].
-        getService(Components.interfaces.nsIWindowMediator);
-    var manager = wm.getMostRecentWindow("Extension:Manager-extensions");
-    if (!manager) {
-      const features = "chrome,dialog=no,resizable";
-      const URI_EXTENSIONS_WINDOW = 
-        "chrome://mozapps/content/extensions/extensions.xul?type=extensions";
-      openDialog(URI_EXTENSIONS_WINDOW, "", features, "updatecheck");
-    }
-    else {
-      manager.performUpdate();
-      manager.focus();
-    }
-  },
-  
   checkForUpdates: function ()
   {
     var prompter = Components.classes["@mozilla.org/updates/update-prompt;1"]
diff --git a/mozilla/browser/components/preferences/advanced.xul b/mozilla/browser/components/preferences/advanced.xul
index 45aa65d5d24..72d95925cbf 100644
--- a/mozilla/browser/components/preferences/advanced.xul
+++ b/mozilla/browser/components/preferences/advanced.xul
@@ -157,10 +157,6 @@
                         label="&enableExtensionUpdate.label;"
                         accesskey="&enableExtensionUpdate.accesskey;"
                         preference="extensions.update.enabled"/>
-              <spacer flex="1"/>
-              <button id="addonCheckNowButton" 
-                      label="&checkNow.label;" accesskey="&extensionsCheckNow.accesskey;"
-                      oncommand="gAdvancedPane.checkForAddonUpdates();"/>
             </hbox>
             <hbox>
               <checkbox id="enableSearchUpdate"
diff --git a/mozilla/browser/locales/en-US/chrome/browser/preferences/advanced.dtd b/mozilla/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
index 1a2df07f562..b140de92436 100644
--- a/mozilla/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
+++ b/mozilla/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
@@ -23,7 +23,6 @@
 <!ENTITY enableSearchUpdate.accesskey   "h">
 <!ENTITY checkNow.label                 "Check Now...">
 <!ENTITY appCheckNow.accesskey          "N">
-<!ENTITY extensionsCheckNow.accesskey   "o">
 <!ENTITY whenUpdatesFound.label         "When updates to &brandShortName; are found,">
 <!ENTITY modeAskMe.label                "Ask me what I want to do">
 <!ENTITY modeAskMe.accesskey            "A">