From 9ef65c5951cb135b8c27cfe7c5b858362cebcf09 Mon Sep 17 00:00:00 2001
From: Richard Marti <richard.marti@gmail.com>
Date: Tue, 11 Sep 2018 21:25:04 +0200
Subject: [PATCH] Bug 1490431 - in files shared with SM, include bindings.css
 stylesheet only for TB. r=jorgk DONTBUILD

---
 mailnews/base/content/subscribe.xul           | 7 ++++---
 mailnews/base/search/content/FilterEditor.xul | 2 ++
 mailnews/jar.mn                               | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/mailnews/base/content/subscribe.xul b/mailnews/base/content/subscribe.xul
index 835f3d64f6..57cdf2e2bb 100644
--- a/mailnews/base/content/subscribe.xul
+++ b/mailnews/base/content/subscribe.xul
@@ -4,10 +4,11 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://messenger/skin/subscribe.css" type="text/css"?>
-<!-- <?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?> -->
-<?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
+#ifndef MOZ_SUITE
 <?xml-stylesheet href="chrome://messenger/content/bindings.css" type="text/css"?>
+#endif
+<?xml-stylesheet href="chrome://messenger/skin/subscribe.css" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/subscribe.dtd">
 
diff --git a/mailnews/base/search/content/FilterEditor.xul b/mailnews/base/search/content/FilterEditor.xul
index e9a0dbf3d9..1e4afbc970 100644
--- a/mailnews/base/search/content/FilterEditor.xul
+++ b/mailnews/base/search/content/FilterEditor.xul
@@ -3,7 +3,9 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
+#ifndef MOZ_SUITE
 <?xml-stylesheet href="chrome://messenger/content/bindings.css" type="text/css"?>
+#endif
 <?xml-stylesheet href="chrome://messenger/skin/filterDialog.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/folderPane.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
diff --git a/mailnews/jar.mn b/mailnews/jar.mn
index 3a7785c8b3..bf42d6377c 100644
--- a/mailnews/jar.mn
+++ b/mailnews/jar.mn
@@ -84,7 +84,7 @@ messenger.jar:
     content/messenger/retention.js                                             (base/content/retention.js)
     content/messenger/shareglue.js                                             (base/content/shareglue.js)
     content/messenger/subscribe.js                                             (base/content/subscribe.js)
-    content/messenger/subscribe.xul                                            (base/content/subscribe.xul)
+*   content/messenger/subscribe.xul                                            (base/content/subscribe.xul)
     content/messenger/virtualFolderListEdit.xul                                (base/content/virtualFolderListEdit.xul)
     content/messenger/virtualFolderListEdit.js                                 (base/content/virtualFolderListEdit.js)
 *   content/messenger/virtualFolderProperties.xul                              (base/content/virtualFolderProperties.xul)