diff options
author | Moonchild <mcwerewolf@wolfbeast.com> | 2019-03-13 07:49:07 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-13 07:49:07 +0100 |
commit | bf0413359245579e9509146d42cd5547e35da695 (patch) | |
tree | 8218d4f60d9eccacbf42df8cb88094a082d401b4 /toolkit/components/downloads/moz.build | |
parent | 51b821b3fdc5a7eab2369cb6a6680598a6264b08 (diff) | |
parent | 709bc24e9110eba12f94cfcb8db00a8338ac4098 (diff) | |
download | UXP-bf0413359245579e9509146d42cd5547e35da695.tar UXP-bf0413359245579e9509146d42cd5547e35da695.tar.gz UXP-bf0413359245579e9509146d42cd5547e35da695.tar.lz UXP-bf0413359245579e9509146d42cd5547e35da695.tar.xz UXP-bf0413359245579e9509146d42cd5547e35da695.zip |
Merge pull request #998 from MoonchildProductions/master
Merge master into Sync-weave
Diffstat (limited to 'toolkit/components/downloads/moz.build')
-rw-r--r-- | toolkit/components/downloads/moz.build | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build index 20394a70d..e611f4010 100644 --- a/toolkit/components/downloads/moz.build +++ b/toolkit/components/downloads/moz.build @@ -53,9 +53,10 @@ if CONFIG['OS_ARCH'] == 'WINNT': 'nsDownloadScanner.cpp', ] -# XXX - Until Suite builds off XULRunner we can't guarantee our implementation -# of nsIDownloadManagerUI overrides toolkit's. -if not CONFIG['MOZ_SUITE']: +# The Communicator Downloads Manager uses its own DownloadManagerUI +# component and it can't be guaranteed that its implimentation will override +# toolkit's so don't include toolkit's +if not CONFIG['MOZ_SUITE'] and not CONFIG['BINOC_COMM_DLMGR']: EXTRA_COMPONENTS += [ 'nsDownloadManagerUI.js', 'nsDownloadManagerUI.manifest', |