Bug 1411121 - Part 4. Remove printPageSetup resources from linux package since Linux will display native dialog. r?mconley
This patch will remove printPageSetup resources from Linux package. This xul is
'PageSetup' dialog, but gecko doesn't use this dialog since gecko will display
a native page setup dialog.
(For Detail, See nsPrintDialogServiceGTK::ShowPageSetup)
MozReview-Commit-ID: 4AFjaM3cB35
--- a/toolkit/components/printing/jar.mn
+++ b/toolkit/components/printing/jar.mn
@@ -1,16 +1,18 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# 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/.
toolkit.jar:
#ifndef XP_MACOSX
+#ifdef XP_WIN
content/global/printPageSetup.js (content/printPageSetup.js)
content/global/printPageSetup.xul (content/printPageSetup.xul)
+#endif
content/global/printPreviewProgress.js (content/printPreviewProgress.js)
content/global/printPreviewProgress.xul (content/printPreviewProgress.xul)
content/global/printProgress.js (content/printProgress.js)
content/global/printProgress.xul (content/printProgress.xul)
#endif
content/global/printPreviewBindings.xml (content/printPreviewBindings.xml)
content/global/printUtils.js (content/printUtils.js)
content/global/simplifyMode.css (content/simplifyMode.css)
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -65,17 +65,19 @@
locale/@AB_CD@/global/languageNames.properties (%chrome/global/languageNames.properties)
locale/@AB_CD@/global/mozilla.dtd (%chrome/global/mozilla.dtd)
#ifndef MOZ_FENNEC
locale/@AB_CD@/global/narrate.properties (%chrome/global/narrate.properties)
#endif
locale/@AB_CD@/global/notification.dtd (%chrome/global/notification.dtd)
locale/@AB_CD@/global/preferences.dtd (%chrome/global/preferences.dtd)
#ifndef MOZ_FENNEC
+#ifndef MOZ_GTK
locale/@AB_CD@/global/printPageSetup.dtd (%chrome/global/printPageSetup.dtd)
+#endif
locale/@AB_CD@/global/printPreview.dtd (%chrome/global/printPreview.dtd)
locale/@AB_CD@/global/printPreviewProgress.dtd (%chrome/global/printPreviewProgress.dtd)
locale/@AB_CD@/global/printdialog.properties (%chrome/global/printdialog.properties)
locale/@AB_CD@/global/printProgress.dtd (%chrome/global/printProgress.dtd)
#endif
locale/@AB_CD@/global/regionNames.properties (%chrome/global/regionNames.properties)
locale/@AB_CD@/global/resetProfile.dtd (%chrome/global/resetProfile.dtd)
locale/@AB_CD@/global/resetProfile.properties (%chrome/global/resetProfile.properties)
--- a/toolkit/themes/linux/global/jar.mn
+++ b/toolkit/themes/linux/global/jar.mn
@@ -19,17 +19,16 @@ toolkit.jar:
skin/classic/global/listbox.css
skin/classic/global/menu.css
skin/classic/global/menulist.css
skin/classic/global/netError.css
* skin/classic/global/notification.css
skin/classic/global/numberbox.css
skin/classic/global/popup.css
skin/classic/global/preferences.css
- skin/classic/global/printPageSetup.css
skin/classic/global/printPreview.css
skin/classic/global/radio.css
skin/classic/global/scrollbox.css
skin/classic/global/splitter.css
skin/classic/global/tabbox.css
skin/classic/global/textbox.css
skin/classic/global/toolbar.css
skin/classic/global/toolbarbutton.css