Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing nsbeta3+ bug 48161. Fixing getAttribute() on a XUL element to conform to the DOM Level 2 spec. This requires some changes in XUL files where various attributes incorrectly have a 'rdf:' prefix. r=waterson@netscape.com & scottip@netscape.com

Browse Source
This commit is contained in:
jst%netscape.com 2000-09-14 05:36:52 +00:00
parent 6af3fb9d3a
commit aa961f07d3
16 changed files with 58 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
content/xul/content/src/nsXULElement.cpp
View File

@ -2821,9 +2821,7 @@ nsXULElement::GetAttribute(PRInt32 aNameSpaceID,
for (PRInt32 i = 0; i < count; i++) {
nsXULAttribute* attr = NS_REINTERPRET_CAST(nsXULAttribute*, Attributes()->ElementAt(i));
nsINodeInfo *ni = attr->GetNodeInfo();
if ((ni->NamespaceEquals(aNameSpaceID) ||
(aNameSpaceID == kNameSpaceID_Unknown) ||
(aNameSpaceID == kNameSpaceID_None)) && ni->Equals(aName)) {
if (ni->Equals(aName, aNameSpaceID)) {
ni->GetPrefixAtom(aPrefix);
attr->GetValue(aResult);
rv = aResult.Length() ? NS_CONTENT_ATTR_HAS_VALUE : NS_CONTENT_ATTR_NO_VALUE;
@ -2836,9 +2834,7 @@ nsXULElement::GetAttribute(PRInt32 aNameSpaceID,
for (PRInt32 i = 0; i < count; i++) {
nsXULPrototypeAttribute* attr = &(mPrototype->mAttributes[i]);
nsINodeInfo *ni = attr->mNodeInfo;
if ((ni->NamespaceEquals(aNameSpaceID) ||
(aNameSpaceID == kNameSpaceID_Unknown) ||
(aNameSpaceID == kNameSpaceID_None)) && ni->Equals(aName)) {
if (ni->Equals(aName, aNameSpaceID)) {
ni->GetPrefixAtom(aPrefix);
aResult.Assign(attr->mValue);
rv = aResult.Length() ? NS_CONTENT_ATTR_HAS_VALUE : NS_CONTENT_ATTR_NO_VALUE;

6
mailnews/addrbook/resources/content/abDirTreeOverlay.xul
View File

@ -30,8 +30,8 @@ Rights Reserved.
class="abDirectory"
ref="abdirectory://"
datasources="rdf:addressdirectory"
rdf:containment="http://home.netscape.com/NC-rdf#child"
rdf:ignore="http://home.netscape.com/NC-rdf#CardChild"
containment="http://home.netscape.com/NC-rdf#child"
ignore="http://home.netscape.com/NC-rdf#CardChild"
onselect="DirPaneSelectionChange(); document.commandDispatcher.updateCommands('tree-select');"
onblur="goOnEvent(this,'blur')"
allownegativeassertions="false"
@ -56,7 +56,7 @@ Rights Reserved.
</template>
<treecolgroup>
<treecol rdf:resource="http://home.netscape.com/NC-rdf#DirName" flex="1"/>
<treecol resource="http://home.netscape.com/NC-rdf#DirName" flex="1"/>
</treecolgroup>
<treechildren id="dirTreeBody" flex="1">

8
mailnews/addrbook/resources/content/abResultsTreeOverlay.xul
View File

@ -56,13 +56,13 @@ Rights Reserved.
</template>
<treecolgroup id="theColumns">
<treecol persist="hidden width" flex="2" id="NameColumn" rdf:resource="http://home.netscape.com/NC-rdf#Name"/>
<treecol persist="hidden width" flex="2" id="NameColumn" resource="http://home.netscape.com/NC-rdf#Name"/>
<splitter class="tree-splitter"/>
<treecol persist="hidden width" flex="3" id="EmailColumn" rdf:resource="http://home.netscape.com/NC-rdf#PrimaryEmail"/>
<treecol persist="hidden width" flex="3" id="EmailColumn" resource="http://home.netscape.com/NC-rdf#PrimaryEmail"/>
<splitter class="tree-splitter"/>
<treecol persist="hidden width" flex="2" id="WorkPhoneColumn" rdf:resource="http://home.netscape.com/NC-rdf#WorkPhone"/>
<treecol persist="hidden width" flex="2" id="WorkPhoneColumn" resource="http://home.netscape.com/NC-rdf#WorkPhone"/>
<splitter class="tree-splitter"/>
<treecol persist="hidden width" flex="2" id="OrganizationColumn" rdf:resource="http://home.netscape.com/NC-rdf#Company"/>
<treecol persist="hidden width" flex="2" id="OrganizationColumn" resource="http://home.netscape.com/NC-rdf#Company"/>
</treecolgroup>
<treehead>

5
mailnews/base/prefs/resources/content/AccountManager.xul
View File

@ -6,7 +6,6 @@
<!DOCTYPE window SYSTEM "chrome://messenger/locale/AccountManager.dtd" >
<window id="account-manager"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
title="&accountManagerTitle.label;"
orient="vertical"
class="dialog"
@ -22,8 +21,8 @@
<box flex="1">
<box orient="vertical" flex="1">
<tree rdf:datasources="rdf:msgaccountmanager" style="width:0px" flex="1"
rdf:containment="http://home.netscape.com/NC-rdf#Settings"
<tree datasources="rdf:msgaccountmanager" style="width:0px" flex="1"
containment="http://home.netscape.com/NC-rdf#Settings"
onselect="onAccountClick(event.target)" id="accounttree"
class="inset"
sortResource="http://home.netscape.com/NC-rdf#Name?sort=true"

5
mailnews/base/prefs/resources/content/am-identity-advanced.xul
View File

@ -28,7 +28,6 @@
<window class="dialog"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
title="&identityAdvanced.label;"
align="vertical"
onload="onLoad();">
@ -40,8 +39,8 @@
<separator class="thin"/>
<box autostretch="never">
<text value="&smtpName.label;" class="label" for="smtpServerList"/>
<menulist rdf:datasources="rdf:smtp"
rdf:containment="http://home.netscape.com/NC-rdf#child"
<menulist datasources="rdf:smtp"
containment="http://home.netscape.com/NC-rdf#child"
ref="NC:smtpservers"
oncommand="onSelected(event)" id="smtpServerList">
<template>

6
mailnews/base/resources/content/commandglue.js
View File

@ -274,14 +274,14 @@ function SetSentFolderColumns(isSentFolder)
senderColumn.setAttribute("value", Bundle.GetStringFromName("recipientColumnHeader"));
senderColumn.setAttribute("onclick", "return top.MsgSortByRecipient();");
senderColumnTemplate.setAttribute("value", "rdf:http://home.netscape.com/NC-rdf#Recipient");
authorColumnHeader.setAttributeNS(gRDFNamespace, "resource", "http://home.netscape.com/NC-rdf#Recipient");
authorColumnHeader.setAttribute("resource", "http://home.netscape.com/NC-rdf#Recipient");
}
else
{
senderColumn.setAttribute("value", Bundle.GetStringFromName("senderColumnHeader"));
senderColumn.setAttribute("onclick", "return top.MsgSortBySender();");
senderColumnTemplate.setAttribute("value", "rdf:http://home.netscape.com/NC-rdf#Sender");
authorColumnHeader.setAttributeNS(gRDFNamespace, "resource", "http://home.netscape.com/NC-rdf#Sender");
authorColumnHeader.setAttribute("resource", "http://home.netscape.com/NC-rdf#Sender");
}
@ -571,7 +571,7 @@ function SortColumn(node, sortKey, secondarySortKey, direction)
try
{
if(secondarySortKey)
node.setAttributeNS(gRDFNamespace, 'resource2', secondarySortKey);
node.setAttribute('resource2', secondarySortKey);
xulSortService.Sort(node, sortKey, sortDirection);
}
catch(e)

2
mailnews/base/resources/content/folderPane.xul
View File

@ -85,7 +85,7 @@
</template>
<treecolgroup>
<treecol persist="width" width="3*" flex="1" id="FolderColumn" rdf:resource="http://home.netscape.com/NC-rdf#FolderTreeName"/>
<treecol persist="width" width="3*" flex="1" id="FolderColumn" resource="http://home.netscape.com/NC-rdf#FolderTreeName"/>
</treecolgroup>
<treehead>

15
mailnews/base/resources/content/mailWindowOverlay.xul
View File

@ -29,7 +29,6 @@ Rights Reserved.
%navigatorDTD;
]>
<overlay
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:nc="http://home.netscape.com/NC-rdf#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@ -187,7 +186,7 @@ Rights Reserved.
value="&contextMoveMsgMenu.label;"
accesskey="&contextMoveMsgMenu.accesskey;"
datasources="rdf:null"
rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild">
ignore="http://home.netscape.com/NC-rdf#MessageChild">
<menupopup/>
<template>
<rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
@ -239,7 +238,7 @@ Rights Reserved.
value="&contextCopyMsgMenu.label;"
accesskey="&contextCopyMsgMenu.accesskey;"
datasources="rdf:null"
rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild">
ignore="http://home.netscape.com/NC-rdf#MessageChild">
<menupopup/>
<template>
<rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
@ -392,7 +391,7 @@ Rights Reserved.
value="&contextMoveMsgMenu.label;"
accesskey="&contextMoveMsgMenu.accesskey;"
datasources="rdf:null"
rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild">
ignore="http://home.netscape.com/NC-rdf#MessageChild">
<menupopup/>
<template>
<rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
@ -444,7 +443,7 @@ Rights Reserved.
value="&contextCopyMsgMenu.label;"
accesskey="&contextCopyMsgMenu.accesskey;"
datasources="rdf:null"
rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild">
ignore="http://home.netscape.com/NC-rdf#MessageChild">
<menupopup/>
<template>
<rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
@ -763,7 +762,7 @@ Rights Reserved.
<menuitem value="&editMsgAsNewCmd.label;" accesskey="&editMsgAsNewCmd.accesskey;" observes="cmd_editAsNew"/>
<menuseparator/>
<menu value="&moveMsgMenu.label;" accesskey="&moveMsgMenu.accesskey;" id="moveMenu" datasources="rdf:null"
rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild">
ignore="http://home.netscape.com/NC-rdf#MessageChild">
<menupopup/>
<template>
<rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
@ -812,7 +811,7 @@ Rights Reserved.
</template>
</menu>
<menu value="&copyMsgMenu.label;" accesskey="&copyMsgMenu.accesskey;" id="copyMenu" datasources="rdf:null"
rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild">
ignore="http://home.netscape.com/NC-rdf#MessageChild">
<menupopup/>
<template>
<rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
@ -889,7 +888,7 @@ Rights Reserved.
<button class="button-toolbar-2 top" id="button-replyall" value="&replyAllButton.label;" tooltip="aTooltip" tooltiptext="&replyAllButton.tooltip;" observes="button_replyall" onclick="MsgReplyToAllMessage(event)"/>
<button class="button-toolbar-2 top" id="button-forward" value="&forwardButton.label;" tooltip="aTooltip" tooltiptext="&forwardButton.tooltip;" observes="button_forward" onclick="MsgForwardMessage(event)"/>
<toolbarseparator/>
<menu id="FileButtonMenu" observes="cmd_file" datasources="rdf:null" rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild">
<menu id="FileButtonMenu" observes="cmd_file" datasources="rdf:null" ignore="http://home.netscape.com/NC-rdf#MessageChild">
<button class="button-toolbar-2 top" observes="cmd_file" id="button-file" value="&fileButton.label;" tooltip="aTooltip" tooltiptext="&fileButton.tooltip;"/>
<template>
<rule nc:CanFileMessages="true" iscontainer="true" isempty="false">

10
mailnews/base/resources/content/msgFolderPickerOverlay.xul
View File

@ -28,7 +28,7 @@ Rights Reserved.
<script language="JavaScript" src="chrome://messenger/content/msgFolderPickerOverlay.js"/>
<script language="JavaScript" src="chrome://messenger/content/mailCommands.js"/>
<menu class="push" value="&newfolderclickhere.label;" uri="" id="msgNewFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild"
<menu class="push" value="&newfolderclickhere.label;" uri="" id="msgNewFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" ignore="http://home.netscape.com/NC-rdf#MessageChild"
ref="msgaccounts:/">
<template>
<rule nc:CanCreateSubfolders="true" iscontainer="true" isempty="false">
@ -78,7 +78,7 @@ Rights Reserved.
<menupopup />
</menu>
<menu class="push" value="&renamefolderclickhere.label;" uri="" id="msgRenameFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild"
<menu class="push" value="&renamefolderclickhere.label;" uri="" id="msgRenameFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" ignore="http://home.netscape.com/NC-rdf#MessageChild"
ref="msgaccounts:/">
<template>
<rule nc:CanRename="true" iscontainer="true" isempty="false">
@ -142,7 +142,7 @@ Rights Reserved.
<menupopup />
</menu>
<menu class="push" value="&filemessagesclickhere.label;" uri="" id="msgFccFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild"
<menu class="push" value="&filemessagesclickhere.label;" uri="" id="msgFccFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" ignore="http://home.netscape.com/NC-rdf#MessageChild"
ref="msgaccounts:/">
<template>
<rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
@ -195,7 +195,7 @@ Rights Reserved.
<menupopup />
</menu>
<menu class="push" value="&filemessagesclickhere.label;" uri="" id="msgDraftsFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild"
<menu class="push" value="&filemessagesclickhere.label;" uri="" id="msgDraftsFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" ignore="http://home.netscape.com/NC-rdf#MessageChild"
ref="msgaccounts:/">
<template>
<rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
@ -248,7 +248,7 @@ Rights Reserved.
<menupopup />
</menu>
<menu class="push" value="&filemessagesclickhere.label;" uri="" id="msgStationeryFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild"
<menu class="push" value="&filemessagesclickhere.label;" uri="" id="msgStationeryFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" ignore="http://home.netscape.com/NC-rdf#MessageChild"
ref="msgaccounts:/">
<template>
<rule nc:CanFileMessages="true" iscontainer="true" isempty="false">

15
mailnews/base/resources/content/subscribe.xul
View File

@ -27,8 +27,7 @@ Rights Reserved.
<!DOCTYPE window SYSTEM "chrome://messenger/locale/subscribe.dtd">
<window xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:NC="http://home.netscape.com/NC-rdf#"
<window xmlns:NC="http://home.netscape.com/NC-rdf#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
orient="vertical"
class="dialog"
@ -59,9 +58,9 @@ Rights Reserved.
<row>
<text class="label" value="&server.label;" for="serverMenu"/>
<menulist oncommand="onServerClick(event);" id="serverMenu"
rdf:datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild"
rdf:containment="http://home.netscape.com/NC-rdf#child"
datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
ignore="http://home.netscape.com/NC-rdf#MessageChild"
containment="http://home.netscape.com/NC-rdf#child"
ref="msgaccounts:/" flex="1">
<template>
<rule NC:CanSubscribe="true">
@ -104,11 +103,11 @@ Rights Reserved.
</template>
<treecolgroup id="theSubscribeColumns">
<treecol flex="7*" id="NameColumn" rdf:resource="http://home.netscape.com/NC-rdf#Name"/>
<treecol flex="7*" id="NameColumn" resource="http://home.netscape.com/NC-rdf#Name"/>
<splitter class="tree-splitter"/>
<treecol flex="1*" id="SubscribedColumn" rdf:resource="http://home.netscape.com/NC-rdf#Subscribed"/>
<treecol flex="1*" id="SubscribedColumn" resource="http://home.netscape.com/NC-rdf#Subscribed"/>
<splitter class="tree-splitter"/>
<treecol flex="1*" id="TotalMessagesColumn" rdf:resource="http://home.netscape.com/NC-rdf#TotalMessages"/>
<treecol flex="1*" id="TotalMessagesColumn" resource="http://home.netscape.com/NC-rdf#TotalMessages"/>
</treecolgroup>
<treehead>

25
mailnews/base/resources/content/threadPane.xul
View File

@ -25,7 +25,6 @@ Rights Reserved.
<!DOCTYPE window SYSTEM "chrome://messenger/locale/threadpane.dtd">
<overlay
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
>
@ -82,28 +81,28 @@ Rights Reserved.
</template>
<treecolgroup id="theThreadColumns">
<treecol persist="hidden" id="ThreadColumn" rdf:resource="http://home.netscape.com/NC-rdf#Thread"/>
<treecol persist="hidden width" width="0" flex="7" id="SubjectColumn" rdf:resource="http://home.netscape.com/NC-rdf#Subject"/>
<treecol persist="hidden" id="ThreadColumn" resource="http://home.netscape.com/NC-rdf#Thread"/>
<treecol persist="hidden width" width="0" flex="7" id="SubjectColumn" resource="http://home.netscape.com/NC-rdf#Subject"/>
<splitter class="tree-splitter"/>
<treecol persist="hidden width" width="0" flex="4" id="AuthorColumn" rdf:resource="http://home.netscape.com/NC-rdf#Sender"/>
<treecol persist="hidden width" width="0" flex="4" id="AuthorColumn" resource="http://home.netscape.com/NC-rdf#Sender"/>
<splitter class="tree-splitter"/>
<treecol persist="hidden" fixed="true" id="UnreadButtonColumn" rdf:resource="http://home.netscape.com/NC-rdf#IsUnread"/>
<treecol persist="hidden" fixed="true" id="UnreadButtonColumn" resource="http://home.netscape.com/NC-rdf#IsUnread"/>
<splitter class="tree-splitter"/>
<treecol persist="hidden width" width="0" flex="2" id="DateColumn" rdf:resource="http://home.netscape.com/NC-rdf#Date"/>
<treecol persist="hidden width" width="0" flex="2" id="DateColumn" resource="http://home.netscape.com/NC-rdf#Date"/>
<splitter class="tree-splitter"/>
<treecol persist="hidden width" width="0" flex="1" id="PriorityColumn" rdf:resource="http://home.netscape.com/NC-rdf#Priority"/>
<treecol persist="hidden width" width="0" flex="1" id="PriorityColumn" resource="http://home.netscape.com/NC-rdf#Priority"/>
<splitter class="tree-splitter"/>
<treecol persist="hidden" fixed="true" id="FlaggedButtonColumn" rdf:resource="http://home.netscape.com/NC-rdf#Flagged"/>
<treecol persist="hidden" fixed="true" id="FlaggedButtonColumn" resource="http://home.netscape.com/NC-rdf#Flagged"/>
<splitter class="tree-splitter"/>
<treecol persist="hidden width" width="0" flex="1" id="StatusColumn" rdf:resource="http://home.netscape.com/NC-rdf#Status"/>
<treecol persist="hidden width" width="0" flex="1" id="StatusColumn" resource="http://home.netscape.com/NC-rdf#Status"/>
<splitter class="tree-splitter"/>
<treecol persist="hidden width" width="0" flex="1" id="SizeColumn" rdf:resource="http://home.netscape.com/NC-rdf#Size"/>
<treecol persist="hidden width" width="0" flex="1" id="SizeColumn" resource="http://home.netscape.com/NC-rdf#Size"/>
<splitter class="tree-splitter"/>
<treecol persist="hidden width" width="0" flex="1" id="UnreadColumn" rdf:resource="http://home.netscape.com/NC-rdf#TotalUnreadMessages"/>
<treecol persist="hidden width" width="0" flex="1" id="UnreadColumn" resource="http://home.netscape.com/NC-rdf#TotalUnreadMessages"/>
<splitter class="tree-splitter"/>
<treecol persist="hidden width" width="0" flex="1" id="TotalColumn" rdf:resource="http://home.netscape.com/NC-rdf#TotalMessages"/>
<treecol persist="hidden width" width="0" flex="1" id="TotalColumn" resource="http://home.netscape.com/NC-rdf#TotalMessages"/>
<splitter class="tree-splitter"/>
<treecol persist="hidden width" width="0" flex="1" id="OrderReceivedColumn" rdf:resource="http://home.netscape.com/NC-rdf#OrderReceived"/>
<treecol persist="hidden width" width="0" flex="1" id="OrderReceivedColumn" resource="http://home.netscape.com/NC-rdf#OrderReceived"/>
<treecol id="PopupColumn"/>
</treecolgroup>

11
mailnews/base/search/resources/content/FilterListDialog.xul
View File

@ -24,7 +24,6 @@ Rights Reserved.
<!DOCTYPE window SYSTEM "chrome://messenger/locale/FilterListDialog.dtd" >
<window class="dialog"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:nc="http://home.netscape.com/NC-rdf#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
orient="vertical"
@ -53,8 +52,8 @@ Rights Reserved.
</row>
<row>
<menulist oncommand="onServerClick(event);" id="serverMenu">
<menupopup rdf:datasources="rdf:msgaccountmanager"
rdf:containment="http://home.netscape.com/NC-rdf#child"
<menupopup datasources="rdf:msgaccountmanager"
containment="http://home.netscape.com/NC-rdf#child"
ref="msgaccounts:/">
<template>
<rule nc:SupportsFilters="true">
@ -76,8 +75,8 @@ Rights Reserved.
<html>&filterHeader.label;</html>
<tree id="filterTree" class="inset" flex="1"
onselect="onFilterSelect(event);"
rdf:datasources="rdf:msgfilters rdf:msgaccountmanager "
rdf:containment="http://home.netscape.com/NC-rdf#child">
datasources="rdf:msgfilters rdf:msgaccountmanager "
containment="http://home.netscape.com/NC-rdf#child">
<treehead>
<treerow>
@ -106,7 +105,7 @@ Rights Reserved.
</template>
<treecolgroup>
<treecol style="width: 0px" flex="1" rdf:resource="http://home.netscape.com/NC-rdf#Name" id="nameColumn"/>
<treecol style="width: 0px" flex="1" resource="http://home.netscape.com/NC-rdf#Name" id="nameColumn"/>
<treecol id="activeColumn"/>
</treecolgroup>

2
mailnews/compose/resources/content/messengercompose.xul
View File

@ -339,7 +339,7 @@
<menuitem type="radio" name="priority" value="&highestPriorityCmd.label;" id="highest"/>
</menupopup>
</menu>
<menu value="&fileCarbonCopyCmd.label;" id="fccMenu" datasources="rdf:mailnewsfolders rdf:msgaccountmanager" ref="msgaccounts:/" rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild">
<menu value="&fileCarbonCopyCmd.label;" id="fccMenu" datasources="rdf:mailnewsfolders rdf:msgaccountmanager" ref="msgaccounts:/" ignore="http://home.netscape.com/NC-rdf#MessageChild">
<menupopup/>
<template>
<rule nc:CanFileMessages="true" iscontainer="true" isempty="false">

3
mailnews/import/resources/content/importProgress.xul
View File

@ -27,8 +27,7 @@ Rights Reserved.
<!DOCTYPE window SYSTEM "chrome://messenger/locale/importDialog.dtd">
<window xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
class="dialog"
onload="OnLoadProgressDialog()"
orient="vertical">

3
mailnews/news/resources/content/downloadheaders.xul
View File

@ -29,8 +29,7 @@ Contributor(s):
<!DOCTYPE window SYSTEM "chrome://messenger/locale/downloadheaders.dtd">
<window xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
class="dialog" style="max-width: 27em; -moz-user-focus: ignore !important"
orient="vertical"
onload="OnLoad()">

8
rdf/content/src/nsXULElement.cpp
View File

@ -2821,9 +2821,7 @@ nsXULElement::GetAttribute(PRInt32 aNameSpaceID,
for (PRInt32 i = 0; i < count; i++) {
nsXULAttribute* attr = NS_REINTERPRET_CAST(nsXULAttribute*, Attributes()->ElementAt(i));
nsINodeInfo *ni = attr->GetNodeInfo();
if ((ni->NamespaceEquals(aNameSpaceID) ||
(aNameSpaceID == kNameSpaceID_Unknown) ||
(aNameSpaceID == kNameSpaceID_None)) && ni->Equals(aName)) {
if (ni->Equals(aName, aNameSpaceID)) {
ni->GetPrefixAtom(aPrefix);
attr->GetValue(aResult);
rv = aResult.Length() ? NS_CONTENT_ATTR_HAS_VALUE : NS_CONTENT_ATTR_NO_VALUE;
@ -2836,9 +2834,7 @@ nsXULElement::GetAttribute(PRInt32 aNameSpaceID,
for (PRInt32 i = 0; i < count; i++) {
nsXULPrototypeAttribute* attr = &(mPrototype->mAttributes[i]);
nsINodeInfo *ni = attr->mNodeInfo;
if ((ni->NamespaceEquals(aNameSpaceID) ||
(aNameSpaceID == kNameSpaceID_Unknown) ||
(aNameSpaceID == kNameSpaceID_None)) && ni->Equals(aName)) {
if (ni->Equals(aName, aNameSpaceID)) {
ni->GetPrefixAtom(aPrefix);
aResult.Assign(attr->mValue);
rv = aResult.Length() ? NS_CONTENT_ATTR_HAS_VALUE : NS_CONTENT_ATTR_NO_VALUE;