[X2Go-Commits] [pale-moon] 84/294: Don't include nsDownloadManagerUI if the Communicator version is used

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch upstream/28.5.0
in repository pale-moon.

commit 7e0d3b80f114a1905003804c35cd863d634ecdbb
Author: Matt A. Tobin <email at mattatobin.com>
Date:   Wed Mar 6 12:02:27 2019 -0500

    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 20394a7..e611f40 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',

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git