wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1117765: Disable OpenH264 module download when media.gmp-gmpopenh264.enabled is set to false. r=bsmedberg

Browse Source
This commit is contained in:
Stephen Pohl 2015-01-05 12:09:24 -05:00
parent b800e0e168
commit dd619430ee
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
toolkit/modules/GMPInstallManager.jsm
View File

@ -116,6 +116,7 @@ let GMPPrefs = {
* List of keys which can be used in get and set
*/
KEY_LOG_ENABLED: "media.gmp-manager.log",
KEY_ADDON_ENABLED: "media.{0}.enabled",
KEY_ADDON_LAST_UPDATE: "media.{0}.lastUpdate",
KEY_ADDON_VERSION: "media.{0}.version",
KEY_ADDON_AUTOUPDATE: "media.{0}.autoupdate",
@ -434,8 +435,10 @@ GMPInstallManager.prototype = {
simpleCheckAndInstall: function() {
let log = getScopedLogger("simpleCheckAndInstall");
let autoUpdate = GMPPrefs.get(GMPPrefs.KEY_ADDON_AUTOUPDATE,
OPEN_H264_ID, true);
let autoUpdate = GMPPrefs.get(GMPPrefs.KEY_ADDON_ENABLED, OPEN_H264_ID,
true) &&
GMPPrefs.get(GMPPrefs.KEY_ADDON_AUTOUPDATE, OPEN_H264_ID,
true);
if (!autoUpdate) {
log.info("Auto-update is off for openh264, aborting check.");
return Promise.resolve({status: "check-disabled"});