Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@158199 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ben%bengoodger.com
2004-06-20 01:42:05 +00:00
parent c42926783a
commit d8bdaa7368
14 changed files with 60 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/browser/extensions/package-fixup/jar.mn
View File

@@ -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)

2
mozilla/embedding/config/embed-jar.mn
View File

@@ -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

22
mozilla/embedding/qa/testembed/nsichanneltests.cpp
View File

@@ -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");
}
}

2
mozilla/netwerk/protocol/about/src/nsAboutRedirector.cpp
View File

@@ -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 },

0
mozilla/themes/classic/communicator/plugins.css → mozilla/themes/classic/global/plugins.css
View File

2
mozilla/themes/classic/jar.mn
View File

@@ -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)

0
mozilla/themes/modern/communicator/plugins.css → mozilla/themes/modern/global/plugins.css
View File

2
mozilla/themes/modern/jar.mn
View File

@@ -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)

7
mozilla/toolkit/locale/region.properties
View File

@@ -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
#

2
mozilla/xpfe/communicator/jar.mn
View File

@@ -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)

2
mozilla/xpfe/global/jar.mn
View File

@@ -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)

63
mozilla/xpfe/communicator/resources/content/plugins.html → mozilla/xpfe/global/resources/content/plugins.html
View File

@@ -1,56 +1,39 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<!-- ***** BEGIN LICENSE BLOCK *****
Version: MPL 1.1/GPL 2.0/LGPL 2.1
<!--
The contents of this file are subject to the Netscape Public License
Version 1.0 (the "NPL"); you may not use this file except in
compliance with the NPL. You may obtain a copy of the NPL at
http://www.mozilla.org/NPL/
The contents of this file are subject to the Mozilla Public License Version
1.1 (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.mozilla.org/MPL/
Software distributed under the NPL is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
for the specific language governing rights and limitations under the
NPL.
Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
for the specific language governing rights and limitations under the
License.
The Initial Developer of this code under the NPL is Netscape
Communications Corporation. Portions created by Netscape are
Copyright (C) 1998 Netscape Communications Corporation. All Rights
Reserved.
The Original Code is mozilla.org Code.
The Initial Developer of the Original Code is
Netscape Communications Corporation.
Portions created by the Initial Developer are Copyright (C) 1998
the Initial Developer. All Rights Reserved.
Contributor(s):
Mark Olson <maolson@earthlink.net>
Alexey Chernyak <alexeyc@bigfoot.com>
Frank Tang <ftang@netscape.com>
Mike Connelly <mozilla@shepherdstown.com>
Robert Kaiser <kairo@kairo.at>
Alternatively, the contents of this file may be used under the terms of
either of the GNU General Public License Version 2 or later (the "GPL"),
or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
in which case the provisions of the GPL or the LGPL are applicable instead
of those above. If you wish to allow use of your version of this file only
under the terms of either the GPL or the LGPL, and not to allow others to
use your version of this file under the terms of the MPL, indicate your
decision by deleting the provisions above and replace them with the notice
and other provisions required by the GPL or the LGPL. If you do not delete
the provisions above, a recipient may use your version of this file under
the terms of any one of the MPL, the GPL or the LGPL.
***** END LICENSE BLOCK ***** -->
Contributors:
Mark Olson <maolson@earthlink.net>
Alexey Chernyak <alexeyc@bigfoot.com>
Frank Tang <ftang@netscape.com>
Mike Connelly <mozilla@shepherdstown.com>
Robert Kaiser <kairo@kairo.at>
-->
<html>
<head>
<script type="application/x-javascript">
var strBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"].getService(Components.interfaces.nsIStringBundleService);
var pluginsbundle = strBundleService.createBundle("chrome://communicator/locale/plugins.properties");
var regionbundle = strBundleService.createBundle("chrome://communicator-region/locale/region.properties");
var pluginsbundle = strBundleService.createBundle("chrome://global/locale/plugins.properties");
var regionbundle = strBundleService.createBundle("chrome://global-region/locale/region.properties");
document.writeln("<title>" + pluginsbundle.GetStringFromName("title_label") + "<\/title>");
</script>
<link rel="stylesheet" type="text/css" href="chrome://communicator/skin/plugins.css">
<link rel="stylesheet" type="text/css" href="chrome://global/skin/plugins.css">
</head>
<body>
<div id="outside">

0
mozilla/xpfe/communicator/resources/locale/en-US/plugins.properties → mozilla/xpfe/global/resources/locale/en-US/plugins.properties
View File

8
mozilla/xpfe/global/resources/locale/en-US/region.properties
View File

@@ -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