From 254178f8e97e43144fb3a7ef454b84804189e581 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Wed, 6 Feb 2019 16:15:27 +0100
Subject: [PATCH] Revert "Add "check for updates" to main menu and AppMenu"

This reverts commit d9a05498806ede2978623019ce222150c5cfcef5.
---
 .../palemoon/base/content/baseMenuOverlay.xul |  6 -----
 .../palemoon/base/content/browser-appmenu.inc |  5 ----
 .../palemoon/base/content/utilityOverlay.js   | 23 -------------------
 .../en-US/chrome/browser/baseMenuOverlay.dtd  |  3 ---
 4 files changed, 37 deletions(-)

diff --git a/application/palemoon/base/content/baseMenuOverlay.xul b/application/palemoon/base/content/baseMenuOverlay.xul
index 903e93fa2f..e9019dc55c 100644
--- a/application/palemoon/base/content/baseMenuOverlay.xul
+++ b/application/palemoon/base/content/baseMenuOverlay.xul
@@ -67,12 +67,6 @@
                   label="&helpSafeMode.label;"
                   oncommand="restart(true);"/>
         <menuseparator id="aboutSeparator"/>
-#ifdef MOZ_UPDATER
-        <menuitem id="helpCheckForUpdates"
-                  accesskey="&checkForUpdates.accesskey;"
-                  label="&checkForUpdates.label;"
-                  oncommand="checkForUpdates();"/>
-#endif
         <menuitem id="aboutName"
                   accesskey="&aboutProduct.accesskey;"
                   label="&aboutProduct.label;"
diff --git a/application/palemoon/base/content/browser-appmenu.inc b/application/palemoon/base/content/browser-appmenu.inc
index 972489b649..cfc855484a 100644
--- a/application/palemoon/base/content/browser-appmenu.inc
+++ b/application/palemoon/base/content/browser-appmenu.inc
@@ -359,11 +359,6 @@
                       label="&appMenuSafeMode.label;"
                       oncommand="restart(true);"/>
             <menuseparator/>
-#ifdef MOZ_UPDATER
-            <menuitem id="appmenu_checkForUpdates"
-                      label="&checkForUpdates.label;"
-                      oncommand="checkForUpdates();"/>
-#endif
             <menuitem id="appmenu_about"
                       label="&aboutProduct.label;"
                       oncommand="openAboutDialog();"/>
diff --git a/application/palemoon/base/content/utilityOverlay.js b/application/palemoon/base/content/utilityOverlay.js
index a37ce1d3ed..2c1a95f83c 100644
--- a/application/palemoon/base/content/utilityOverlay.js
+++ b/application/palemoon/base/content/utilityOverlay.js
@@ -590,29 +590,6 @@ function openAdvancedPreferences(tabID)
   openPreferences("paneAdvanced", { "advancedTab" : tabID });
 }
 
-#ifdef MOZ_UPDATER
-/**
- * Opens the update manager and checks for updates to the application.
- */
-function checkForUpdates()
-{
-  var um = 
-      Components.classes["@mozilla.org/updates/update-manager;1"].
-      getService(Components.interfaces.nsIUpdateManager);
-  var prompter = 
-      Components.classes["@mozilla.org/updates/update-prompt;1"].
-      createInstance(Components.interfaces.nsIUpdatePrompt);
-
-  // If there's an update ready to be applied, show the "Update Downloaded"
-  // UI instead and let the user know they have to restart the browser for
-  // the changes to be applied. 
-  if (um.activeUpdate && um.activeUpdate.state == "pending")
-    prompter.showUpdateDownloaded(um.activeUpdate);
-  else
-    prompter.checkForUpdates();
-}
-#endif
-
 /**
  * Opens the troubleshooting information (about:support) page for this version
  * of the application.
diff --git a/application/palemoon/locales/en-US/chrome/browser/baseMenuOverlay.dtd b/application/palemoon/locales/en-US/chrome/browser/baseMenuOverlay.dtd
index 23e6816255..a926b0ed24 100644
--- a/application/palemoon/locales/en-US/chrome/browser/baseMenuOverlay.dtd
+++ b/application/palemoon/locales/en-US/chrome/browser/baseMenuOverlay.dtd
@@ -25,9 +25,6 @@
 <!ENTITY helpTroubleshootingInfo.label      "Troubleshooting Information">
 <!ENTITY helpTroubleshootingInfo.accesskey  "T">
 
-<!ENTITY checkForUpdates.label       "Check for Updates…">
-<!ENTITY checkForUpdates.accesskey   "C">
-
 <!ENTITY helpFeedbackPage.label      "Submit Feedback…">
 <!ENTITY helpFeedbackPage.accesskey  "S">