diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-11-07 12:47:12 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-11-07 12:47:12 +0100 |
| commit | 8240fb9c736f91044cabbdde8c537b179fc4921e (patch) | |
| tree | 49a4cc8dc683cf955d61b6618ad471860554ccb5 /xpcom/components/ManifestParser.cpp | |
| parent | f9e04b54c2ccbc1f8e24b511003de09b4565193c (diff) | |
| parent | 5c83a18cde404b5c0c9fba1d35f003d951ea32e2 (diff) | |
| download | UXP-8240fb9c736f91044cabbdde8c537b179fc4921e.tar UXP-8240fb9c736f91044cabbdde8c537b179fc4921e.tar.gz UXP-8240fb9c736f91044cabbdde8c537b179fc4921e.tar.lz UXP-8240fb9c736f91044cabbdde8c537b179fc4921e.tar.xz UXP-8240fb9c736f91044cabbdde8c537b179fc4921e.zip | |
Merge branch 'master' into Pale_Moon-release
# Conflicts:
# application/palemoon/config/version.txt
Diffstat (limited to 'xpcom/components/ManifestParser.cpp')
| -rw-r--r-- | xpcom/components/ManifestParser.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp index 4dcfc8402..7188c0ec5 100644 --- a/xpcom/components/ManifestParser.cpp +++ b/xpcom/components/ManifestParser.cpp @@ -637,14 +637,6 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf, continue; } -#ifndef MOZ_BINARY_EXTENSIONS - if (directive->apponly && NS_APP_LOCATION != aType) { - LogMessageWithContext(aFile, line, - "Only application manifests may use the '%s' directive.", token); - continue; - } -#endif - if (directive->componentonly && NS_SKIN_LOCATION == aType) { LogMessageWithContext(aFile, line, "Skin manifest not allowed to use '%s' directive.", |