This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch upstream/28.4.0 in repository pale-moon. commit d9a05498806ede2978623019ce222150c5cfcef5 Author: wolfbeast <mcwerewolf@wolfbeast.com> Date: Wed Feb 6 15:59:19 2019 +0100 Add "check for updates" to main menu and AppMenu Tag #963. --- .../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 insertions(+) diff --git a/application/palemoon/base/content/baseMenuOverlay.xul b/application/palemoon/base/content/baseMenuOverlay.xul index e9019dc..903e93f 100644 --- a/application/palemoon/base/content/baseMenuOverlay.xul +++ b/application/palemoon/base/content/baseMenuOverlay.xul @@ -67,6 +67,12 @@ 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 cfc8554..972489b 100644 --- a/application/palemoon/base/content/browser-appmenu.inc +++ b/application/palemoon/base/content/browser-appmenu.inc @@ -359,6 +359,11 @@ 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 2c1a95f..a37ce1d 100644 --- a/application/palemoon/base/content/utilityOverlay.js +++ b/application/palemoon/base/content/utilityOverlay.js @@ -590,6 +590,29 @@ 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 a926b0e..23e6816 100644 --- a/application/palemoon/locales/en-US/chrome/browser/baseMenuOverlay.dtd +++ b/application/palemoon/locales/en-US/chrome/browser/baseMenuOverlay.dtd @@ -25,6 +25,9 @@ <!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"> -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git