From f28fddccc3a31ac9701fd90eba1fa3ac3b1dd7a6 Mon Sep 17 00:00:00 2001 From: "gavin%gavinsharp.com" Date: Fri, 30 Dec 2005 07:37:58 +0000 Subject: [PATCH] Bug 321732: printjoboptions.properties is dead, the other printjoboptions.* files should be packaged on non-Mac Unix only, r=mconnor git-svn-id: svn://10.0.0.236/trunk@186742 18797224-902f-48f8-a5cc-f745e15eee43 --- .../components/printing/content/printjoboptions.js | 3 --- .../components/printing/content/printjoboptions.xul | 4 ---- mozilla/toolkit/components/printing/jar.mn | 4 ++++ .../en-US/chrome/global/printjoboptions.properties | 9 --------- mozilla/toolkit/locales/jar.mn | 1 - 5 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 mozilla/toolkit/locales/en-US/chrome/global/printjoboptions.properties diff --git a/mozilla/toolkit/components/printing/content/printjoboptions.js b/mozilla/toolkit/components/printing/content/printjoboptions.js index 83e30e13323..7537bb24f14 100644 --- a/mozilla/toolkit/components/printing/content/printjoboptions.js +++ b/mozilla/toolkit/components/printing/content/printjoboptions.js @@ -38,7 +38,6 @@ # # ***** END LICENSE BLOCK ***** */ # -#ifdef XP_UNIX var dialog; var gPrintSettings = null; @@ -972,5 +971,3 @@ function onAccept() return true; } - -#endif diff --git a/mozilla/toolkit/components/printing/content/printjoboptions.xul b/mozilla/toolkit/components/printing/content/printjoboptions.xul index eb49aeda005..18dfbd357a9 100644 --- a/mozilla/toolkit/components/printing/content/printjoboptions.xul +++ b/mozilla/toolkit/components/printing/content/printjoboptions.xul @@ -41,8 +41,6 @@ # # ***** END LICENSE BLOCK ***** -#ifdef XP_UNIX - @@ -162,5 +160,3 @@ - -#endif diff --git a/mozilla/toolkit/components/printing/jar.mn b/mozilla/toolkit/components/printing/jar.mn index 11cb7f4d246..afc2ee6501d 100644 --- a/mozilla/toolkit/components/printing/jar.mn +++ b/mozilla/toolkit/components/printing/jar.mn @@ -1,8 +1,12 @@ toolkit.jar: *+ content/global/printdialog.js (content/printdialog.js) *+ content/global/printdialog.xul (content/printdialog.xul) +#ifdef XP_UNIX +#ifndef XP_MACOSX *+ content/global/printjoboptions.js (content/printjoboptions.js) *+ content/global/printjoboptions.xul (content/printjoboptions.xul) +#endif +#endif *+ content/global/printPageSetup.js (content/printPageSetup.js) *+ content/global/printPageSetup.xul (content/printPageSetup.xul) *+ content/global/printPreviewBindings.xml (content/printPreviewBindings.xml) diff --git a/mozilla/toolkit/locales/en-US/chrome/global/printjoboptions.properties b/mozilla/toolkit/locales/en-US/chrome/global/printjoboptions.properties deleted file mode 100644 index 7ebd011bd9a..00000000000 --- a/mozilla/toolkit/locales/en-US/chrome/global/printjoboptions.properties +++ /dev/null @@ -1,9 +0,0 @@ -letterSize=Letter (8 1/2 x 11 in.) -legalSize=Legal (8 1/2 x 14 in.) -exectiveSize=Executive (7 1/2 x 10 in.) -a5Size=DIN A5 (148 x 210 mm) -a4Size=DIN A4 (210 x 297 mm) -a3Size=DIN A3 (297 x 420 mm) -a2Size=DIN A2 (420 x 594 mm) -a1Size=DIN A1 (594 x 841 mm) -a0Size=DIN A0 (841 x 1189 mm) diff --git a/mozilla/toolkit/locales/jar.mn b/mozilla/toolkit/locales/jar.mn index 0b742202e4c..de61a7617f8 100644 --- a/mozilla/toolkit/locales/jar.mn +++ b/mozilla/toolkit/locales/jar.mn @@ -34,7 +34,6 @@ locale/@AB_CD@/global/preferences.dtd (%chrome/global/preferences.dtd) + locale/@AB_CD@/global/printdialog.dtd (%chrome/global/printdialog.dtd) + locale/@AB_CD@/global/printjoboptions.dtd (%chrome/global/printjoboptions.dtd) -+ locale/@AB_CD@/global/printjoboptions.properties (%chrome/global/printjoboptions.properties) + locale/@AB_CD@/global/printPageSetup.dtd (%chrome/global/printPageSetup.dtd) + locale/@AB_CD@/global/printPreview.dtd (%chrome/global/printPreview.dtd) + locale/@AB_CD@/global/printPreviewProgress.dtd (%chrome/global/printPreviewProgress.dtd)