bug 941322 deprecate facebook messenger features, r=felipe

This commit is contained in:
Shane Caraveo 2014-02-28 18:07:44 -05:00
parent 4c2b5c3fd4
commit 4b536ca9f6
2 changed files with 9 additions and 3 deletions

File diff suppressed because one or more lines are too long

View File

@ -246,12 +246,18 @@ function migrateSettings() {
defaultManifest = Services.prefs.getDefaultBranch(null) defaultManifest = Services.prefs.getDefaultBranch(null)
.getComplexValue(prefname, Ci.nsISupportsString).data; .getComplexValue(prefname, Ci.nsISupportsString).data;
defaultManifest = JSON.parse(defaultManifest); defaultManifest = JSON.parse(defaultManifest);
} catch(e) {
// not a built-in, continue
}
if (defaultManifest) {
if (defaultManifest.shareURL && !manifest.shareURL) { if (defaultManifest.shareURL && !manifest.shareURL) {
manifest.shareURL = defaultManifest.shareURL; manifest.shareURL = defaultManifest.shareURL;
needsUpdate = true; needsUpdate = true;
} }
} catch(e) { if (defaultManifest.version && (!manifest.version || defaultManifest.version > manifest.version)) {
// not a built-in, continue manifest = defaultManifest;
needsUpdate = true;
}
} }
if (needsUpdate) { if (needsUpdate) {
// the provider was installed with an older build, so we will update the // the provider was installed with an older build, so we will update the