From a8e7875fd3a61174f2047de54029cba7949b2b80 Mon Sep 17 00:00:00 2001 From: "scott%scott-macgregor.org" Date: Wed, 26 May 2004 21:35:07 +0000 Subject: [PATCH] Use some toolkit print code in favor of xpfe's and remove some seamonkey dtds/gifs. Patch by Stephen Walker --- mail/config/en-US-jar.mn | 12 +++++++----- mail/config/mail-jar.mn | 6 +----- mail/config/qute-jar.mn | 14 ++++++-------- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/mail/config/en-US-jar.mn b/mail/config/en-US-jar.mn index 9c1100bb7b09..2683209c3b01 100644 --- a/mail/config/en-US-jar.mn +++ b/mail/config/en-US-jar.mn @@ -14,7 +14,6 @@ locale/en-US/messenger/addressbook, en-US/locale/en-US/mes locale/en-US/messenger/messengercompose, en-US/locale/en-US/messenger/messengercompose locale/en-US/messenger-smime, en-US/locale/en-US/messenger-smime - ################################################################################################# # xpfe extensions (ldap, wallet, etc) ################################################################################################# @@ -42,9 +41,6 @@ locale/en-US/communicator/layout, en-US/locale/en-US/comm locale/en-US/communicator/contentAreaCommands.dtd, en-US/locale/en-US/communicator/contentAreaCommands.dtd locale/en-US/communicator/contentAreaCommands.properties, en-US/locale/en-US/communicator/contentAreaCommands.properties locale/en-US/communicator/contents.rdf, en-US/locale/en-US/communicator/contents.rdf -locale/en-US/communicator/printPageSetup.dtd, en-US/locale/en-US/communicator/printPageSetup.dtd -locale/en-US/communicator/printPageSetup.properties, en-US/locale/en-US/communicator/printPageSetup.properties -locale/en-US/communicator/printPreview.dtd, en-US/locale/en-US/communicator/printPreview.dtd locale/en-US/communicator/utilityOverlay.dtd, en-US/locale/en-US/communicator/utilityOverlay.dtd locale/en-US/communicator/utilityOverlay.properties, en-US/locale/en-US/communicator/utilityOverlay.properties locale/en-US/communicator/wallet/wallet.properties, en-US/locale/en-US/communicator/wallet/wallet.properties @@ -95,7 +91,13 @@ locale/US/global-region, US/locale/US/global-re ################################################################################################# # crypto ################################################################################################# -locale/en-US/pippki, en-US/locale/en-US/pippki +locale/en-US/pippki/certManager.dtd, en-US/locale/en-US/pippki/certManager.dtd +locale/en-US/pippki/contents.rdf, en-US/locale/en-US/pippki/contents.rdf +locale/en-US/pippki/deviceManager.dtd, en-US/locale/en-US/pippki/deviceManager.dtd +locale/en-US/pippki/newserver.dtd, en-US/locale/en-US/pippki/newserver.dtd +locale/en-US/pippki/newserver.properties, en-US/locale/en-US/pippki/newserver.properties +locale/en-US/pippki/pippki.dtd, en-US/locale/en-US/pippki/pippki.dtd +locale/en-US/pippki/pippki.properties, en-US/locale/en-US/pippki/pippki.properties locale/en-US/pipnss, en-US/locale/en-US/pipnss ################################################################################################# diff --git a/mail/config/mail-jar.mn b/mail/config/mail-jar.mn index 080ce6f2014e..cc11355000ec 100644 --- a/mail/config/mail-jar.mn +++ b/mail/config/mail-jar.mn @@ -21,7 +21,6 @@ content/messenger/addressbook, msg/content/messenger/addre ################################################################################################# # Files we need from comm.jar ################################################################################################# - content/editor, comm/content/editor content/editor-region, comm/content/editor-region content/communicator-region, comm/content/communicator-region, @@ -31,8 +30,6 @@ content/communicator/communicator.css, comm/content/communicator/ content/communicator/communicatorOverlay.xul, comm/content/communicator/communicatorOverlay.xul content/communicator/utilityOverlay.xul, comm/content/communicator/utilityOverlay.xul content/communicator/utilityOverlay.js, comm/content/communicator/utilityOverlay.js -content/communicator/tasksOverlay.js, comm/content/communicator/tasksOverlay.js -content/communicator/tasksOverlay.xul, comm/content/communicator/tasksOverlay.xul content/communicator/browserBindings.xul, comm/content/communicator/browserBindings.xul content/communicator/editorBindings.xul, comm/content/communicator/editorBindings.xul content/communicator/platformBrowserBindings.xul, comm/content/communicator/platformBrowserBindings.xul @@ -44,7 +41,6 @@ content/communicator/contentAreaDD.js, comm/content/communicator/ content/communicator/contentAreaClick.js, comm/content/communicator/contentAreaClick.js content/communicator/contentAreaContextOverlay.xul, comm/content/communicator/contentAreaContextOverlay.xul content/communicator/nsContextMenu.js, comm/content/communicator/nsContextMenu.js -content/communicator/printPreviewBindings.xml, comm/content/communicator/printPreviewBindings.xml content/communicator/printing.js, comm/content/communicator/printing.js content/communicator/XPCNativeWrapper.js, comm/content/communicator/XPCNativeWrapper.js @@ -117,6 +113,7 @@ content/global/printdialog.xul, toolkit/content/global/pri content/global/printdialog.js, toolkit/content/global/printdialog.js content/global/printProgress.xul, toolkit/content/global/printProgress.xul content/global/printProgress.js, toolkit/content/global/printProgress.js +content/global/printPreviewBindings.xml, toolkit/content/global/printPreviewBindings.xml content/global/printPreviewProgress.xul, toolkit/content/global/printPreviewProgress.xul content/global/printPreviewProgress.js, toolkit/content/global/printPreviewProgress.js content/global/printPageSetup.js, toolkit/content/global/printPageSetup.js @@ -165,7 +162,6 @@ content/global/nsProgressDialog.xul, toolkit/content/global/nsP content/pipnss/contents.rdf, pipnss/content/pipnss/contents.rdf content/pippki, pippki/content/pippki - ################################################################################################# # files needed by the optional pref extension. These files may not necessarily exist if the extension # was not built. That's ok. diff --git a/mail/config/qute-jar.mn b/mail/config/qute-jar.mn index de77077e4155..c49f060b162f 100644 --- a/mail/config/qute-jar.mn +++ b/mail/config/qute-jar.mn @@ -9,7 +9,6 @@ ################################################################################################# # mail ################################################################################################# - skin/classic/messenger, classic/skin/classic/messenger skin/classic/messenger/icons, classic/skin/classic/messenger/icons skin/classic/messenger/addressbook, classic/skin/classic/messenger/addressbook @@ -67,17 +66,11 @@ skin/classic/global/arrow, classic/skin/classic/glob skin/classic/global/tree, classic/skin/classic/global/tree skin/classic/global/checkbox, classic/skin/classic/global/checkbox skin/classic/global/radio, classic/skin/classic/global/radio - skin/classic/global/icons, classic/skin/classic/global/icons skin/classic/global/toolbar, classic/skin/classic/global/toolbar skin/classic/global/menu, classic/skin/classic/global/menu skin/classic/global/progressmeter, classic/skin/classic/global/progressmeter - -# mozilla/toolkit skin/classic/global/console, classic/skin/classic/global/console -skin/classic/global/icons/Message.png classic/skin/classic/global/icons/Message.png -skin/classic/global/icons/Question.png classic/skin/classic/global/icons/Question.png -skin/classic/global/icons/Warning.png classic/skin/classic/global/cons/Warning.png ################################################################################################# # Editor @@ -88,4 +81,9 @@ skin/classic/editor/EdImageMapPage.css, classic/skin/classic/edito skin/classic/editor/editor.css, classic/skin/classic/editor/editor.css skin/classic/editor/EditorDialog.css, classic/skin/classic/editor/EditorDialog.css skin/classic/editor/textEditor.css, classic/skin/classic/editor/textEditor.css -skin/classic/editor/icons, classic/skin/classic/editor/icons +skin/classic/editor/icons/btn1.gif, classic/skin/classic/editor/icons/btn1.gif +skin/classic/editor/icons/img-align-bottom.gif, classic/skin/classic/editor/icons/img-align-bottom.gif +skin/classic/editor/icons/img-align-left.gif, classic/skin/classic/editor/icons/img-align-left.gif +skin/classic/editor/icons/img-align-middle.gif, classic/skin/classic/editor/icons/img-align-middle.gif +skin/classic/editor/icons/img-align-right.gif, classic/skin/classic/editor/icons/img-align-right.gif +skin/classic/editor/icons/img-align-top.gif, classic/skin/classic/editor/icons/img-align-top.gif