From d8bdaa7368669a01a3c1056355251268f4673862 Mon Sep 17 00:00:00 2001 From: "ben%bengoodger.com" Date: Sun, 20 Jun 2004 01:42:05 +0000 Subject: [PATCH] 243387 - about:plugins broken by download size reduction changes. Move about:plugins page to global package to remove dependency on defunct "communicator" package. r=mconnor git-svn-id: svn://10.0.0.236/trunk@158199 18797224-902f-48f8-a5cc-f745e15eee43 --- .../browser/extensions/package-fixup/jar.mn | 6 +- mozilla/embedding/config/embed-jar.mn | 2 +- .../qa/testembed/nsichanneltests.cpp | 22 +++---- .../protocol/about/src/nsAboutRedirector.cpp | 2 +- .../{communicator => global}/plugins.css | 0 mozilla/themes/classic/jar.mn | 2 +- .../{communicator => global}/plugins.css | 0 mozilla/themes/modern/jar.mn | 2 +- mozilla/toolkit/locale/region.properties | 7 +++ mozilla/xpfe/communicator/jar.mn | 2 - mozilla/xpfe/global/jar.mn | 2 + .../resources/content/plugins.html | 63 +++++++------------ .../resources/locale/en-US/plugins.properties | 0 .../resources/locale/en-US/region.properties | 8 +++ 14 files changed, 60 insertions(+), 58 deletions(-) rename mozilla/themes/classic/{communicator => global}/plugins.css (100%) rename mozilla/themes/modern/{communicator => global}/plugins.css (100%) rename mozilla/xpfe/{communicator => global}/resources/content/plugins.html (64%) rename mozilla/xpfe/{communicator => global}/resources/locale/en-US/plugins.properties (100%) diff --git a/mozilla/browser/extensions/package-fixup/jar.mn b/mozilla/browser/extensions/package-fixup/jar.mn index c75b7e2cc0f..c1ba64e199e 100644 --- a/mozilla/browser/extensions/package-fixup/jar.mn +++ b/mozilla/browser/extensions/package-fixup/jar.mn @@ -4,7 +4,8 @@ classic.jar: skin/classic/communicator/profile/profileManager.css (../../../themes/classic/communicator/profile/profileManager.css) skin/classic/communicator/profile/profileicon-large.gif (../../../themes/classic/communicator/profile/profileicon-large.gif) skin/classic/communicator/communicator.css -* skin/classic/communicator/contents.rdf (../../../themes/classic/communicator/contents.rdf) +* skin/classic/communicator/contents.rdf (../../../themes/classic/communicator/contents.rdf) + skin/classic/global/plugins.css (../../../themes/classic/global/plugins.css) comm.jar: * content/communicator/contents.rdf (../../../xpfe/communicator/resources/content/contents.rdf) @@ -12,4 +13,7 @@ comm.jar: en-US.jar: * locale/en-US/communicator/contents.rdf (../../../xpfe/communicator/resources/locale/en-US/contents.rdf) locale/en-US/communicator/xpinstall/xpinstall.properties (../../../xpinstall/res/locale/en-US/xpinstall.properties) + locale/en-US/global/plugins.properties (../../../xpfe/global/resources/locale/en-US/plugins.properties) +toolkit.jar: + content/global/plugins.html (../../../xpfe/global/resources/content/plugins.html) diff --git a/mozilla/embedding/config/embed-jar.mn b/mozilla/embedding/config/embed-jar.mn index f567c12358d..fa8ffee0938 100644 --- a/mozilla/embedding/config/embed-jar.mn +++ b/mozilla/embedding/config/embed-jar.mn @@ -14,7 +14,7 @@ content/global/bindings, toolkit/content/global/bindings content/global-platform, toolkit/content/global-platform content/global-region, toolkit/content/global-region content/communicator/contents.rdf, comm/content/communicator/contents.rdf -content/communicator/plugins.html, comm/content/communicator/plugins.html +content/global/plugins.html, comm/content/global/plugins.html skin/classic/forms, classic/skin/classic/forms skin/classic/global, classic/skin/classic/global skin/classic/global/arrow, classic/skin/classic/global/arrow diff --git a/mozilla/embedding/qa/testembed/nsichanneltests.cpp b/mozilla/embedding/qa/testembed/nsichanneltests.cpp index 1ecac5c8955..9897375f704 100644 --- a/mozilla/embedding/qa/testembed/nsichanneltests.cpp +++ b/mozilla/embedding/qa/testembed/nsichanneltests.cpp @@ -82,7 +82,7 @@ ChannelRow ChannelTable[] = { {"about:mozilla", ""}, {"javascript:document.write('hi')", ""}, {"data:text/plain;charset=iso-8859-7,%be%fg%be", ""}, - {"jar:resource:///chrome/comm.jar!/content/communicator/plugins.html", ""}, + {"jar:resource:///chrome/toolkit.jar!/content/global/plugins.html", ""}, }; ///////////////////////////////////////////////////////////////////////////// @@ -369,8 +369,8 @@ void CnsIChannelTests::AsyncOpenTest(nsIChannel *theChannel, PRInt16 displayMode theSupports = do_QueryInterface(theChannel); if (!theSupports) QAOutput("Didn't get the nsISupports object. AsyncOpen() failed.", displayMode); - - SaveObject(theSupports); + + SaveObject(theSupports); rv = theChannel->AsyncOpen(listener, theSupports); RvTestResult(rv, "AsyncOpen()", displayMode); @@ -380,14 +380,14 @@ void CnsIChannelTests::AsyncOpenTest(nsIChannel *theChannel, PRInt16 displayMode void CnsIChannelTests::PostAsyncOpenTests(nsIChannel *theChannel, PRInt16 displayMode) { - // These tests are run after the channel is opened (using AsyncOpen()) + // These tests are run after the channel is opened (using AsyncOpen()) // To run them in TestEmbed, select Tests > asyncOpen menu and enter complete URL with protocol - GetOriginalURITest(theChannel, displayMode); - GetURITest(theChannel, displayMode); - SetOwnerTest(theChannel, displayMode); - GetOwnerTest(theChannel, displayMode); - SetNotificationsTest(theChannel, displayMode); - GetNotificationsTest(theChannel, displayMode); + GetOriginalURITest(theChannel, displayMode); + GetURITest(theChannel, displayMode); + SetOwnerTest(theChannel, displayMode); + GetOwnerTest(theChannel, displayMode); + SetNotificationsTest(theChannel, displayMode); + GetNotificationsTest(theChannel, displayMode); GetSecurityInfoTest(theChannel, displayMode); SetContentTypeTest(theChannel, displayMode); GetContentTypeTest(theChannel, displayMode); @@ -491,7 +491,7 @@ void CnsIChannelTests::RunAllTests() SetNotificationsTest(theChannel, 1); GetNotificationsTest(theChannel, 1); AsyncOpenTest(theChannel, 1); - // PostAsyncOpenTests() called from nsIRequestObserver::OnStartRequest (in BrowserImpl.cpp) + // PostAsyncOpenTests() called from nsIRequestObserver::OnStartRequest (in BrowserImpl.cpp) QAOutput("\n"); } } \ No newline at end of file diff --git a/mozilla/netwerk/protocol/about/src/nsAboutRedirector.cpp b/mozilla/netwerk/protocol/about/src/nsAboutRedirector.cpp index 091f30cbcb1..17a5aafc47e 100644 --- a/mozilla/netwerk/protocol/about/src/nsAboutRedirector.cpp +++ b/mozilla/netwerk/protocol/about/src/nsAboutRedirector.cpp @@ -60,7 +60,7 @@ struct RedirEntry { static RedirEntry kRedirMap[] = { { "credits", "http://www.mozilla.org/credits/", PR_TRUE }, { "mozilla", "chrome://global/content/mozilla.xhtml", PR_TRUE }, - { "plugins", "chrome://communicator/content/plugins.html", PR_FALSE }, + { "plugins", "chrome://global/content/plugins.html", PR_FALSE }, { "config", "chrome://global/content/config.xul", PR_FALSE }, { "logo", "chrome://global/content/logo.gif", PR_TRUE }, { "buildconfig", "chrome://global/content/buildconfig.html", PR_TRUE }, diff --git a/mozilla/themes/classic/communicator/plugins.css b/mozilla/themes/classic/global/plugins.css similarity index 100% rename from mozilla/themes/classic/communicator/plugins.css rename to mozilla/themes/classic/global/plugins.css diff --git a/mozilla/themes/classic/jar.mn b/mozilla/themes/classic/jar.mn index f797ff459f9..d710c0f0604 100644 --- a/mozilla/themes/classic/jar.mn +++ b/mozilla/themes/classic/jar.mn @@ -7,7 +7,6 @@ classic.jar: skin/classic/communicator/communicator.css (communicator/communicator.css) skin/classic/communicator/formatting.css (communicator/formatting.css) skin/classic/communicator/prefpanels.css (communicator/prefpanels.css) - skin/classic/communicator/plugins.css (communicator/plugins.css) skin/classic/communicator/smileys.css (communicator/smileys.css) skin/classic/communicator/bookmarks/bookmark-folder-button.gif (communicator/bookmarks/bookmark-folder-button.gif) skin/classic/communicator/bookmarks/bookmark-folder-closed.gif (communicator/bookmarks/bookmark-folder-closed.gif) @@ -119,6 +118,7 @@ classic.jar: skin/classic/editor/icons/progress-busy.gif (editor/icons/progress-busy.gif) skin/classic/editor/icons/progress-done.gif (editor/icons/progress-done.gif) skin/classic/editor/icons/progress-failed.gif (editor/icons/progress-failed.gif) + skin/classic/global/plugins.css (global/plugins.css) skin/classic/global/printing.css (global/printing.css) skin/classic/global/filepicker/blank.gif (global/filepicker/blank.gif) skin/classic/global/filepicker/dir-closed.gif (global/filepicker/dir-closed.gif) diff --git a/mozilla/themes/modern/communicator/plugins.css b/mozilla/themes/modern/global/plugins.css similarity index 100% rename from mozilla/themes/modern/communicator/plugins.css rename to mozilla/themes/modern/global/plugins.css diff --git a/mozilla/themes/modern/jar.mn b/mozilla/themes/modern/jar.mn index ab96512c0d4..dffda986082 100644 --- a/mozilla/themes/modern/jar.mn +++ b/mozilla/themes/modern/jar.mn @@ -7,7 +7,6 @@ modern.jar: skin/modern/communicator/button.css (communicator/button.css) skin/modern/communicator/toolbar.css (communicator/toolbar.css) skin/modern/communicator/dialogs.css (communicator/dialogs.css) - skin/modern/communicator/plugins.css (communicator/plugins.css) skin/modern/communicator/smileys.css (communicator/smileys.css) skin/modern/communicator/communicator.css (communicator/communicator.css) skin/modern/communicator/bookmarks/bookmark-folder-closed.gif (communicator/bookmarks/bookmark-folder-closed.gif) @@ -139,6 +138,7 @@ modern.jar: skin/modern/editor/icons/progress-failed.gif (editor/icons/progress-failed.gif) * skin/modern/global/contents.rdf (global/contents.rdf) skin/modern/global/globalBindings.xml (global/globalBindings.xml) + skin/modern/global/plugins.css (global/plugins.css) skin/modern/global/preview.gif (global/preview.gif) skin/modern/global/button.css (global/button.css) skin/modern/global/checkbox.css (global/checkbox.css) diff --git a/mozilla/toolkit/locale/region.properties b/mozilla/toolkit/locale/region.properties index 3bafeea827b..475e69d220e 100644 --- a/mozilla/toolkit/locale/region.properties +++ b/mozilla/toolkit/locale/region.properties @@ -2,6 +2,13 @@ # Localizable URLs # pluginStartupMessage=Starting Plugin for type + +# plug-ins URLs +more_plugins_label=Netscape.com +more_plugins_url=http://home.netscape.com/plugins/index.html +plugindoc_label=plugindoc.mozdev.org +plugindoc_url=http://plugindoc.mozdev.org/ + # # brand.properties # diff --git a/mozilla/xpfe/communicator/jar.mn b/mozilla/xpfe/communicator/jar.mn index 05d8ba63658..372e777a19b 100644 --- a/mozilla/xpfe/communicator/jar.mn +++ b/mozilla/xpfe/communicator/jar.mn @@ -27,7 +27,6 @@ comm.jar: content/communicator/findUtils.js (resources/content/findUtils.js) content/communicator/printPreviewBindings.xml (resources/content/printPreviewBindings.xml) content/communicator/printing.js (resources/content/printing.js) - content/communicator/plugins.html (resources/content/plugins.html) content/communicator/popupManager.js (resources/content/popupManager.js) content/communicator/popupManager.xul (resources/content/popupManager.xul) content/communicator/aboutPopups.xul (resources/content/aboutPopups.xul) @@ -49,7 +48,6 @@ en-US.jar: locale/en-US/communicator/popupManager.dtd (resources/locale/en-US/popupManager.dtd) locale/en-US/communicator/popupManager.properties (resources/locale/en-US/popupManager.properties) locale/en-US/communicator/aboutPopups.dtd (resources/locale/en-US/aboutPopups.dtd) - locale/en-US/communicator/plugins.properties (resources/locale/en-US/plugins.properties) US.jar: * locale/US/communicator-region/contents.rdf (resources/locale/en-US/contents-region.rdf) diff --git a/mozilla/xpfe/global/jar.mn b/mozilla/xpfe/global/jar.mn index 3851fabddd4..13129d76757 100644 --- a/mozilla/xpfe/global/jar.mn +++ b/mozilla/xpfe/global/jar.mn @@ -37,6 +37,7 @@ toolkit.jar: content/global/printProgress.js (resources/content/printProgress.js) content/global/printPreviewProgress.xul (resources/content/printPreviewProgress.xul) content/global/printPreviewProgress.js (resources/content/printPreviewProgress.js) + content/global/plugins.html (resources/content/plugins.html) content/global/fullScreen.js (resources/content/fullScreen.js) content/global/build.dtd (build.dtd) content/global/MPL-1.1.html (resources/content/MPL-1.1.html) @@ -95,6 +96,7 @@ en-US.jar: locale/en-US/global/commonDialogs.properties (resources/locale/en-US/commonDialogs.properties) locale/en-US/global/nsTreeSorting.properties (resources/locale/en-US/nsTreeSorting.properties) locale/en-US/global/dialog.properties (resources/locale/en-US/dialog.properties) + locale/en-US/global/plugins.properties (resources/locale/en-US/plugins.properties) locale/en-US/global/printdialog.dtd (resources/locale/en-US/printdialog.dtd) locale/en-US/global/printPageSetup.dtd (resources/locale/en-US/printPageSetup.dtd) locale/en-US/global/printPageSetup.properties (resources/locale/en-US/printPageSetup.properties) diff --git a/mozilla/xpfe/communicator/resources/content/plugins.html b/mozilla/xpfe/global/resources/content/plugins.html similarity index 64% rename from mozilla/xpfe/communicator/resources/content/plugins.html rename to mozilla/xpfe/global/resources/content/plugins.html index cd768cb595d..a9aa3d1d616 100755 --- a/mozilla/xpfe/communicator/resources/content/plugins.html +++ b/mozilla/xpfe/global/resources/content/plugins.html @@ -1,56 +1,39 @@ - + Contributors: + Mark Olson + Alexey Chernyak + Frank Tang + Mike Connelly + Robert Kaiser + --> - +
diff --git a/mozilla/xpfe/communicator/resources/locale/en-US/plugins.properties b/mozilla/xpfe/global/resources/locale/en-US/plugins.properties similarity index 100% rename from mozilla/xpfe/communicator/resources/locale/en-US/plugins.properties rename to mozilla/xpfe/global/resources/locale/en-US/plugins.properties diff --git a/mozilla/xpfe/global/resources/locale/en-US/region.properties b/mozilla/xpfe/global/resources/locale/en-US/region.properties index 3bafeea827b..4e95bc2bd44 100644 --- a/mozilla/xpfe/global/resources/locale/en-US/region.properties +++ b/mozilla/xpfe/global/resources/locale/en-US/region.properties @@ -2,8 +2,16 @@ # Localizable URLs # pluginStartupMessage=Starting Plugin for type + +# plug-ins URLs +more_plugins_label=Netscape.com +more_plugins_url=http://home.netscape.com/plugins/index.html +plugindoc_label=plugindoc.mozdev.org +plugindoc_url=http://plugindoc.mozdev.org/ + # # brand.properties # getNewThemesURL=http://mozilla.org/themes/download/ smartBrowsingURL=http://www.mozilla.org/docs/end-user/internet-keywords.html +