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 737446 -'null' is shown in installation popup instead of name obtained from AMO metadata. r=Unfocused

Browse Source
This commit is contained in:
Sachin Hosmani 2013-05-22 14:49:25 +05:30
parent f1fd250572
commit 7d3a2b1bd2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
toolkit/mozapps/extensions/XPIProvider.jsm
View File

@ -4605,11 +4605,13 @@ AddonInstall.prototype = {
* XPI is incorrectly signed
*/
loadManifest: function AI_loadManifest(aCallback) {
let self = this;
function addRepositoryData(aAddon) {
// Try to load from the existing cache first
AddonRepository.getCachedAddonByID(aAddon.id, function loadManifest_getCachedAddonByID(aRepoAddon) {
if (aRepoAddon) {
aAddon._repositoryAddon = aRepoAddon;
self.name = self.name || aAddon._repositoryAddon.name;
aAddon.compatibilityOverrides = aRepoAddon.compatibilityOverrides;
aAddon.appDisabled = !isUsableAddon(aAddon);
aCallback();
@ -4620,6 +4622,7 @@ AddonInstall.prototype = {
AddonRepository.cacheAddons([aAddon.id], function loadManifest_cacheAddons() {
AddonRepository.getCachedAddonByID(aAddon.id, function loadManifest_getCachedAddonByID(aRepoAddon) {
aAddon._repositoryAddon = aRepoAddon;
self.name = self.name || aAddon._repositoryAddon.name;
aAddon.compatibilityOverrides = aRepoAddon ?
aRepoAddon.compatibilityOverrides :
null;
@ -4667,7 +4670,6 @@ AddonInstall.prototype = {
}
if (this.addon.type == "multipackage") {
let self = this;
this.loadMultipackageManifests(zipreader, function loadManifest_loadMultipackageManifests() {
addRepositoryData(self.addon);
});