Bug 321732: printjoboptions.properties is dead, the other printjoboptions.* files should be packaged on non-Mac Unix only, r=mconnor

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

toolkit/components/printing/content/printjoboptions.xul

@@ -41,8 +41,6 @@
 #
 # ***** END LICENSE BLOCK *****
 
-#ifdef XP_UNIX
-
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <!DOCTYPE dialog SYSTEM "chrome://global/locale/printjoboptions.dtd">
 
@@ -162,5 +160,3 @@
   </grid>
 
 </dialog>
-
-#endif

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)

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)