summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-02-06 16:15:27 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-02-06 16:15:27 +0100
commit8db772d2ca44ff44f32d434e7f62acba289b4155 (patch)
tree1daa0159c33879411168d78ade4c8f941cff1ba0
parentd9a05498806ede2978623019ce222150c5cfcef5 (diff)
downloadUXP-8db772d2ca44ff44f32d434e7f62acba289b4155.tar
UXP-8db772d2ca44ff44f32d434e7f62acba289b4155.tar.gz
UXP-8db772d2ca44ff44f32d434e7f62acba289b4155.tar.lz
UXP-8db772d2ca44ff44f32d434e7f62acba289b4155.tar.xz
UXP-8db772d2ca44ff44f32d434e7f62acba289b4155.zip
Revert "Add "check for updates" to main menu and AppMenu"
This reverts commit d9a05498806ede2978623019ce222150c5cfcef5.
-rw-r--r--application/palemoon/base/content/baseMenuOverlay.xul6
-rw-r--r--application/palemoon/base/content/browser-appmenu.inc5
-rw-r--r--application/palemoon/base/content/utilityOverlay.js23
-rw-r--r--application/palemoon/locales/en-US/chrome/browser/baseMenuOverlay.dtd3
4 files changed, 0 insertions, 37 deletions
diff --git a/application/palemoon/base/content/baseMenuOverlay.xul b/application/palemoon/base/content/baseMenuOverlay.xul
index 903e93fa2..e9019dc55 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 972489b64..cfc855484 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 a37ce1d3e..2c1a95f83 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 23e681625..a926b0ed2 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">