From 3133535495fd447826bad60b5a8a1809c23d99b2 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Wed, 6 Mar 2019 11:37:20 -0500 Subject: [PATCH] Don't include nsDownloadManagerUI if the Communicator version is used Maintain backwards compatibility with MOZ_SUITE --- toolkit/components/downloads/moz.build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build index 20394a70d2..61271ff27f 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 it's own DownloadManagerUI +# component and it can't be guaranteed that it's implimentation will override +# toolkit's so don't include toolkit's +if not CONFIG['MOZ_SUITE'] or not CONFIG['BINOC_COMM_DLMGR']: EXTRA_COMPONENTS += [ 'nsDownloadManagerUI.js', 'nsDownloadManagerUI.manifest',