From dffc96d73be883aa66a4680e69833105de87b81a Mon Sep 17 00:00:00 2001 From: "scott%scott-macgregor.org" Date: Mon, 7 Mar 2005 20:00:00 +0000 Subject: [PATCH] Bug #284144 --> packaging changes to support the new options UI --- mail/config/en-US-jar.mn | 1 + mail/config/mail-jar.mn | 14 +++----------- mail/config/qute-jar.mn | 5 ++--- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/mail/config/en-US-jar.mn b/mail/config/en-US-jar.mn index 093eb76f1a0..a54b34e9b7e 100644 --- a/mail/config/en-US-jar.mn +++ b/mail/config/en-US-jar.mn @@ -15,6 +15,7 @@ locale/en-US/messenger, en-US/locale/en-US/messenger locale/en-US/messenger/addressbook, en-US/locale/en-US/messenger/addressbook locale/en-US/messenger/messengercompose, en-US/locale/en-US/messenger/messengercompose +locale/en-US/messenger/preferences, en-US/locale/en-US/messenger/preferences locale/en-US/messenger/migration, en-US/locale/en-US/messenger/migration locale/en-US/messenger-smime, en-US/locale/en-US/messenger-smime locale/en-US/messenger-mapi, en-US/locale/en-US/messenger-mapi diff --git a/mail/config/mail-jar.mn b/mail/config/mail-jar.mn index db726df2f64..d6cb6dcaf1b 100644 --- a/mail/config/mail-jar.mn +++ b/mail/config/mail-jar.mn @@ -15,7 +15,8 @@ content/messenger-region, msg/content/messenger-regio content/messenger-smime, msg/content/messenger-smime content/messenger-views, msg/content/messenger-views content/messenger/messengercompose, msg/content/messenger/messengercompose -content/editor/images, msg/content/editor/images +content/messenger/preferences, msg/content/messenger/preferences +content/editor/images, msg/content/editor/images content/messenger/addressbook, msg/content/messenger/addressbook content/messenger/migration, msg/content/messenger/migration @@ -26,7 +27,7 @@ content/editor, comm/content/editor content/editor-region, comm/content/editor-region content/communicator-region, comm/content/communicator-region, content/communicator-platform, comm/content/communicator-platform -content/communicator/contents.rdf, comm/content/communicator/contents.rdf +content/communicator/contents.rdf, comm/content/communicator/contents.rdf 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 @@ -45,15 +46,6 @@ content/communicator/printing.js, comm/content/communicator/ # from xpfe\components jar.mn content/communicator/alerts, comm/content/communicator/alerts -content/communicator/pref/pref-themes.xul, comm/content/communicator/pref/pref-themes.xul -content/communicator/pref/pref-themes.js, comm/content/communicator/pref/pref-themes.js -content/communicator/pref/pref-extensions.xul, comm/content/communicator/pref/pref-extensions.xul -content/communicator/pref/pref-extensions.js, comm/content/communicator/pref/pref-extensions.js -content/communicator/pref/pref-fonts.js, comm/content/communicator/pref/pref-fonts.js -content/communicator/pref/pref-fonts.xul, comm/content/communicator/pref/pref-fonts.xul -content/communicator/pref/pref.xul, comm/content/communicator/pref/pref.xul -content/communicator/pref/nsPrefWindow.js, comm/content/communicator/pref/nsPrefWindow.js -content/communicator/pref/pref-calibrate-screen.xul, comm/content/communicator/pref/pref-calibrate-screen.xul # dummy contextHelp.js file so we don't get a bunch of errors about this file not being found content/help/contextHelp.js, comm/content/help/contextHelp.js diff --git a/mail/config/qute-jar.mn b/mail/config/qute-jar.mn index 68fde83a59b..3d4a0bc0ec7 100644 --- a/mail/config/qute-jar.mn +++ b/mail/config/qute-jar.mn @@ -15,6 +15,7 @@ skin/classic/messenger/accountcentral, classic/skin/classic/messen skin/classic/messenger/addressbook, classic/skin/classic/messenger/addressbook skin/classic/messenger/addressbook/icons, classic/skin/classic/messenger/addressbook/icons skin/classic/messenger/messengercompose, classic/skin/classic/messenger/messengercompose +skin/classic/messenger/preferences, classic/skin/classic/messenger/preferences skin/classic/messenger/smime, classic/skin/classic/messenger/smime skin/classic/messenger/smime/icons, classic/skin/classic/messenger/smime/icons skin/classic/messenger-newsblog, classic/skin/classic/messenger-newsblog @@ -50,19 +51,17 @@ skin/classic/communicator/icons/smileys/smiley-cry.png, classic/skin/c skin/classic/communicator/icons/smileys/smiley-smile.png, classic/skin/classic/communicator/icons/smileys/smiley-smile.png skin/classic/communicator/icons/smileys/smiley-sealed.png, classic/skin/classic/communicator/icons/smileys/smiley-sealed.png -skin/classic/communicator/pref/pref.css, classic/skin/classic/communicator/pref/pref.css skin/classic/communicator/xpinstall/xpinstall.css, classic/skin/classic/communicator/xpinstall/xpinstall.css ################################################################################################# # mozapps ################################################################################################# -skin/classic/mozapps/pref, classic/skin/classic/mozapps/pref skin/classic/mozapps/contents.rdf, classic/skin/classic/mozapps/contents.rdf skin/classic/mozapps/downloads, classic/skin/classic/mozapps/downloads skin/classic/mozapps/profile, classic/skin/classic/mozapps/profile skin/classic/mozapps/extensions, classic/skin/classic/mozapps/extensions skin/classic/mozapps/update, classic/skin/classic/mozapps/update -skin/classic/mozapps/xpinstall, classic/skin/classic/mozapps/xpinstall +skin/classic/mozapps/xpinstall, classic/skin/classic/mozapps/xpinstall skin/classic/mozapps/shared, classic/skin/classic/mozapps/shared #################################################################################################