From 474d2a96861b81d5e998b095a2c4eb36c19d1820 Mon Sep 17 00:00:00 2001
From: "disttsc%bart.nl" <disttsc%bart.nl@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 20 Sep 2000 10:16:53 +0000
Subject: [PATCH] Remove incorrect 'rdf:' from 'rdf:resource', 'rdf:resource2'
 and 'rdf:containment'. Part of bug=53297, more to follow. r=rjc, a=waterson.
 This particular checkin should fix bug=52789 (column sorting in bookmarks and
 history) and bug=52547 (sidebar bookmarks panel not showing sort triangle).

git-svn-id: svn://10.0.0.236/trunk@79619 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/rdf/resources/dom-test-2.xul          |  4 +--
 mozilla/rdf/resources/dom-test-3.xul          |  4 +--
 mozilla/rdf/resources/ignore-test.xul         |  4 +--
 mozilla/rdf/resources/xpidl-test-1.xul        |  4 +--
 .../domds/resources/DOMDataSourceViewer.xul   |  4 +--
 mozilla/rdf/tests/dsds/DataSourceViewer.xul   |  4 +--
 .../bookmarks/resources/bm-find.xul           |  8 ++---
 .../bookmarks/resources/bm-panel.xul          |  2 +-
 .../bookmarks/resources/bookmarks.xul         | 26 ++++++++--------
 .../xpfe/components/directory/directory.xul   | 10 +++----
 .../components/history/resources/history.xul  | 12 ++++----
 .../search/resources/findresults.xul          |  8 ++---
 .../components/search/resources/internet.xul  |  4 +--
 .../search/resources/internetresults.xul      | 30 +++++++++----------
 .../search/resources/search-editor.xul        |  4 +--
 .../search/resources/search-panel.xul         | 10 +++----
 16 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/mozilla/rdf/resources/dom-test-2.xul b/mozilla/rdf/resources/dom-test-2.xul
index 42508c76b1c..785cfa05040 100644
--- a/mozilla/rdf/resources/dom-test-2.xul
+++ b/mozilla/rdf/resources/dom-test-2.xul
@@ -94,8 +94,8 @@ function SetItemText()
 
 <tree id="tree" datasources="rdf:bookmarks" onclick="return OpenURL(event,event.target.parentNode);">
   <treecolgroup>
-    <treecol rdf:resource="http://home.netscape.com/NC-rdf#Name" flex="1"/>
-    <treecol rdf:resource="http://home.netscape.com/NC-rdf#URL" flex="1"/>
+    <treecol resource="http://home.netscape.com/NC-rdf#Name" flex="1"/>
+    <treecol resource="http://home.netscape.com/NC-rdf#URL" flex="1"/>
   </treecolgroup>
   <treehead>
     <treeitem>
diff --git a/mozilla/rdf/resources/dom-test-3.xul b/mozilla/rdf/resources/dom-test-3.xul
index e582b6cd30d..6fff7441d86 100644
--- a/mozilla/rdf/resources/dom-test-3.xul
+++ b/mozilla/rdf/resources/dom-test-3.xul
@@ -52,8 +52,8 @@ function AddBookmark()
 
 <tree id="tree" datasources="rdf:bookmarks" onclick="return OpenURL(event,event.target.parentNode);">
   <treecolgroup>
-    <treecol rdf:resource="http://home.netscape.com/NC-rdf#Name" flex="1"/>
-    <treecol rdf:resource="http://home.netscape.com/NC-rdf#URL" flex="1"/>
+    <treecol resource="http://home.netscape.com/NC-rdf#Name" flex="1"/>
+    <treecol resource="http://home.netscape.com/NC-rdf#URL" flex="1"/>
   </treecolgroup>
   <treehead>
     <treeitem>
diff --git a/mozilla/rdf/resources/ignore-test.xul b/mozilla/rdf/resources/ignore-test.xul
index 1cc53ba92ed..226a782b76d 100644
--- a/mozilla/rdf/resources/ignore-test.xul
+++ b/mozilla/rdf/resources/ignore-test.xul
@@ -29,8 +29,8 @@ function SetIgnore()
 </html:form>
 
 <tree id="tree" datasources="rdf:bookmarks" onclick="return OpenURL(event,event.target.parentNode);">
-  <treecol rdf:resource="http://home.netscape.com/NC-rdf#Name"/>
-  <treecol rdf:resource="http://home.netscape.com/NC-rdf#URL"/>
+  <treecol resource="http://home.netscape.com/NC-rdf#Name"/>
+  <treecol resource="http://home.netscape.com/NC-rdf#URL"/>
 
   <treehead>
     <treeitem>
diff --git a/mozilla/rdf/resources/xpidl-test-1.xul b/mozilla/rdf/resources/xpidl-test-1.xul
index d292a510263..4359b48a5b8 100644
--- a/mozilla/rdf/resources/xpidl-test-1.xul
+++ b/mozilla/rdf/resources/xpidl-test-1.xul
@@ -33,8 +33,8 @@ function RenamePersonalToolbar()
 
 <tree id="tree" datasources="rdf:bookmarks" onclick="return OpenURL(event,event.target.parentNode);">
   <treecolgroup>
-    <treecol rdf:resource="http://home.netscape.com/NC-rdf#Name" flex="1"/>
-    <treecol rdf:resource="http://home.netscape.com/NC-rdf#URL" flex="1"/>
+    <treecol resource="http://home.netscape.com/NC-rdf#Name" flex="1"/>
+    <treecol resource="http://home.netscape.com/NC-rdf#URL" flex="1"/>
   </treecolgroup>
   <treehead>
     <treeitem>
diff --git a/mozilla/rdf/tests/domds/resources/DOMDataSourceViewer.xul b/mozilla/rdf/tests/domds/resources/DOMDataSourceViewer.xul
index b9a3ea11c8c..c0355f1be81 100644
--- a/mozilla/rdf/tests/domds/resources/DOMDataSourceViewer.xul
+++ b/mozilla/rdf/tests/domds/resources/DOMDataSourceViewer.xul
@@ -45,8 +45,8 @@
   </treechildren>
   </template>
 
-  <treecol style="width: 50%" id="NameColumn" rdf:resource="http://home.netscape.com/NC-rdf#Name"/>
-  <treecol style="width: 50%" id="ValueColumn" rdf:resource="http://home.netscape.com/NC-rdf#Value"/>
+  <treecol style="width: 50%" id="NameColumn" resource="http://home.netscape.com/NC-rdf#Name"/>
+  <treecol style="width: 50%" id="ValueColumn" resource="http://home.netscape.com/NC-rdf#Value"/>
   <treehead>
     <treerow>
       <treecell value="Name"/>
diff --git a/mozilla/rdf/tests/dsds/DataSourceViewer.xul b/mozilla/rdf/tests/dsds/DataSourceViewer.xul
index 2b6cdc50dab..54ed2709cda 100644
--- a/mozilla/rdf/tests/dsds/DataSourceViewer.xul
+++ b/mozilla/rdf/tests/dsds/DataSourceViewer.xul
@@ -12,8 +12,8 @@
   id="dataSourceTree"
   containment="http://home.netscape.com/NC-rdf#child">
   <treecolgroup>
-    <treecol id="NameColumn" rdf:resource="http://home.netscape.com/NC-rdf#Name" flex="1"/>
-    <treecol id="ValueColumn" rdf:resource="http://home.netscape.com/NC-rdf#Value" flex="1"/>
+    <treecol id="NameColumn" resource="http://home.netscape.com/NC-rdf#Name" flex="1"/>
+    <treecol id="ValueColumn" resource="http://home.netscape.com/NC-rdf#Value" flex="1"/>
   </treecolgroup>
   <treehead>
     <treeitem>
diff --git a/mozilla/xpfe/components/bookmarks/resources/bm-find.xul b/mozilla/xpfe/components/bookmarks/resources/bm-find.xul
index 5c792519e56..15861a3345d 100755
--- a/mozilla/xpfe/components/bookmarks/resources/bm-find.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/bm-find.xul
@@ -210,17 +210,17 @@
 
 		<treecolgroup id="theColumns">
 			<treecol id="NameColumn" persist="hidden width" width="2*" flex="2"
-				rdf:resource="http://home.netscape.com/NC-rdf#Name"
+				resource="http://home.netscape.com/NC-rdf#Name"
 				sortActive="true" sortDirection="ascending" />
 			<splitter class="tree-splitter"/>
 			<treecol id="URLColumn" persist="hidden width" width="2*" flex="2"
-				rdf:resource="http://home.netscape.com/NC-rdf#URL"/>
+				resource="http://home.netscape.com/NC-rdf#URL"/>
 			<splitter class="tree-splitter"/>
 			<treecol id="ShortcutURLColumn" persist="hidden width" width="1*" flex="1"
-				rdf:resource="http://home.netscape.com/NC-rdf#ShortcutURL"/>
+				resource="http://home.netscape.com/NC-rdf#ShortcutURL"/>
 			<splitter class="tree-splitter"/>
 			<treecol id="DescriptionColumn" persist="hidden width" width="1*" flex="1"
-				rdf:resource="http://home.netscape.com/NC-rdf#Description"/>
+				resource="http://home.netscape.com/NC-rdf#Description"/>
 			<splitter class="tree-splitter"/>
 			<treecol id="PopupColumn" persist="width" fixed="true" width="14" />
 		</treecolgroup>
diff --git a/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul b/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul
index 7cf7cea5fa8..a0642fb7c86 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul
@@ -89,7 +89,7 @@
 
   <treecolgroup id="theColumns">
       <treecol flex="1" id="NameColumn" sortSeparators="true"
-      	rdf:resource="http://home.netscape.com/NC-rdf#Name"/>
+               resource="http://home.netscape.com/NC-rdf#Name"/>
   </treecolgroup>
 
   <treehead>
diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul b/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul
index 3105b585b47..e4898c6bd8c 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul
@@ -251,49 +251,49 @@
   <treecolgroup id="theColumns">
     <treecol id="Name"
       sortSeparators="true" persist="hidden width" width="4*" flex="4"
-      rdf:resource="http://home.netscape.com/NC-rdf#Name"/>
+      resource="http://home.netscape.com/NC-rdf#Name"/>
 
     <splitter class="tree-splitter"/>
 
     <treecol id="URL"
       sortSeparators="true" persist="hidden width" width="4*" flex="4"
-      rdf:resource="http://home.netscape.com/NC-rdf#URL"
-      rdf:resource2="http://home.netscape.com/NC-rdf#Name"/>
+      resource="http://home.netscape.com/NC-rdf#URL"
+      resource2="http://home.netscape.com/NC-rdf#Name"/>
 
     <splitter class="tree-splitter"/>
 
     <treecol id="ShortcutURL"
       sortSeparators="true" persist="hidden width" width="1*" flex="1"
-      rdf:resource="http://home.netscape.com/NC-rdf#ShortcutURL"
-      rdf:resource2="http://home.netscape.com/NC-rdf#Name"/>
+      resource="http://home.netscape.com/NC-rdf#ShortcutURL"
+      resource2="http://home.netscape.com/NC-rdf#Name"/>
 
     <splitter class="tree-splitter"/>
 
     <treecol id="Description"
       sortSeparators="true" persist="hidden width" width="1*" flex="1"
-      rdf:resource="http://home.netscape.com/NC-rdf#Description"
-      rdf:resource2="http://home.netscape.com/NC-rdf#Name"/>
+      resource="http://home.netscape.com/NC-rdf#Description"
+      resource2="http://home.netscape.com/NC-rdf#Name"/>
 
     <splitter class="tree-splitter"/>
 
     <treecol id="LastVisitDate"
       sortSeparators="true" persist="hidden width" width="1*" flex="1"
-      rdf:resource="http://home.netscape.com/WEB-rdf#LastVisitDate"
-      rdf:resource2="http://home.netscape.com/NC-rdf#Name"/>
+      resource="http://home.netscape.com/WEB-rdf#LastVisitDate"
+      resource2="http://home.netscape.com/NC-rdf#Name"/>
 
     <splitter class="tree-splitter"/>
 
     <treecol id="BookmarkAddDate"
       sortSeparators="true" persist="hidden width" width="1*" flex="1"
-      rdf:resource="http://home.netscape.com/NC-rdf#BookmarkAddDate"
-      rdf:resource2="http://home.netscape.com/NC-rdf#Name"/>
+      resource="http://home.netscape.com/NC-rdf#BookmarkAddDate"
+      resource2="http://home.netscape.com/NC-rdf#Name"/>
 
     <splitter class="tree-splitter"/>
 
     <treecol id="LastModifiedDate"
       sortSeparators="true" persist="hidden width" width="1*" flex="1"
-      rdf:resource="http://home.netscape.com/WEB-rdf#LastModifiedDate"
-      rdf:resource2="http://home.netscape.com/NC-rdf#Name"/>
+      resource="http://home.netscape.com/WEB-rdf#LastModifiedDate"
+      resource2="http://home.netscape.com/NC-rdf#Name"/>
     <treecol persist="width" fixed="true" width="14" id="PopupColumn"/>
   </treecolgroup>
 
diff --git a/mozilla/xpfe/components/directory/directory.xul b/mozilla/xpfe/components/directory/directory.xul
index 247ce0796df..fbc348fdeac 100644
--- a/mozilla/xpfe/components/directory/directory.xul
+++ b/mozilla/xpfe/components/directory/directory.xul
@@ -59,15 +59,15 @@
       <treecolgroup>
         <treecol flex="1" id="FilenameColumn"
             sortActive="true" sortDirection="ascending"
-            rdf:resource="http://home.netscape.com/NC-rdf#Name" />
+            resource="http://home.netscape.com/NC-rdf#Name" />
         <splitter class="tree-splitter"/>
         <treecol flex="1" id="ContentLengthColumn"
-            rdf:resource="http://home.netscape.com/NC-rdf#Content-Length"
-            rdf:resource2="http://home.netscape.com/NC-rdf#Name"/>
+            resource="http://home.netscape.com/NC-rdf#Content-Length"
+            resource2="http://home.netscape.com/NC-rdf#Name"/>
         <splitter class="tree-splitter"/>
         <treecol flex="1" id="LastModColumn"
-            rdf:resource="http://home.netscape.com/WEB-rdf#LastModifiedDate"
-            rdf:resource2="http://home.netscape.com/NC-rdf#Name"/>
+            resource="http://home.netscape.com/WEB-rdf#LastModifiedDate"
+            resource2="http://home.netscape.com/NC-rdf#Name"/>
       </treecolgroup>
 
       <treehead>
diff --git a/mozilla/xpfe/components/history/resources/history.xul b/mozilla/xpfe/components/history/resources/history.xul
index d908fa948d0..6795ceb5ffe 100644
--- a/mozilla/xpfe/components/history/resources/history.xul
+++ b/mozilla/xpfe/components/history/resources/history.xul
@@ -178,21 +178,21 @@
   <treecolgroup id="theColumns">
     <treecol flex="4" id="Name"
       sortSeparators="true" persist="hidden width" 
-      rdf:resource="http://home.netscape.com/NC-rdf#Name"/>
+      resource="http://home.netscape.com/NC-rdf#Name"/>
 
     <splitter class="tree-splitter"/>
 
     <treecol flex="4" id="URL"
       sortSeparators="true" persist="hidden width" 
-      rdf:resource="http://home.netscape.com/NC-rdf#URL"
-      rdf:resource2="http://home.netscape.com/NC-rdf#Name"/>
+      resource="http://home.netscape.com/NC-rdf#URL"
+      resource2="http://home.netscape.com/NC-rdf#Name"/>
 
     <splitter class="tree-splitter"/>
 
     <treecol flex="1" id="Date"
       sortSeparators="true" persist="hidden width" 
-      rdf:resource="http://home.netscape.com/NC-rdf#Date"
-      rdf:resource2="http://home.netscape.com/NC-rdf#Name"/>
+      resource="http://home.netscape.com/NC-rdf#Date"
+      resource2="http://home.netscape.com/NC-rdf#Name"/>
 
     <splitter class="tree-splitter"/>
 
@@ -234,4 +234,4 @@
     <statusbarpanel id="statusbar-display" crop="right" flex="1"/>
   </statusbar>
 
-</window>
\ No newline at end of file
+</window>
diff --git a/mozilla/xpfe/components/search/resources/findresults.xul b/mozilla/xpfe/components/search/resources/findresults.xul
index dd5b5e6104e..eef0b0aec4d 100644
--- a/mozilla/xpfe/components/search/resources/findresults.xul
+++ b/mozilla/xpfe/components/search/resources/findresults.xul
@@ -15,10 +15,10 @@
 		onclick="if (event.detail == 2) return OpenURL(event, event.target.parentNode.parentNode);">
 
                 <treecolgroup>
-		  <treecol id="NameColumn" rdf:resource="http://home.netscape.com/NC-rdf#Name" sortActive="true" sortDirection="ascending" flex="1"/>
-		  <treecol id="URLColumn" rdf:resource="http://home.netscape.com/NC-rdf#URL" flex="1"/>
-		  <treecol id="ShortcutURLColumn" rdf:resource="http://home.netscape.com/NC-rdf#ShortcutURL" flex="1"/>
-		  <treecol id="DescriptionColumn" rdf:resource="http://home.netscape.com/NC-rdf#Description" flex="1"/>
+		  <treecol id="NameColumn" resource="http://home.netscape.com/NC-rdf#Name" sortActive="true" sortDirection="ascending" flex="1"/>
+		  <treecol id="URLColumn" resource="http://home.netscape.com/NC-rdf#URL" flex="1"/>
+		  <treecol id="ShortcutURLColumn" resource="http://home.netscape.com/NC-rdf#ShortcutURL" flex="1"/>
+		  <treecol id="DescriptionColumn" resource="http://home.netscape.com/NC-rdf#Description" flex="1"/>
                 </treecolgroup>
 
 		<template>
diff --git a/mozilla/xpfe/components/search/resources/internet.xul b/mozilla/xpfe/components/search/resources/internet.xul
index c4da693a21d..e56fda9a1a9 100644
--- a/mozilla/xpfe/components/search/resources/internet.xul
+++ b/mozilla/xpfe/components/search/resources/internet.xul
@@ -50,8 +50,8 @@
 		<tree align="horizontal" id="searchengines" border="1" flex="1" datasources="rdf:internetsearch" ref="NC:SearchEngineRoot">
                         <treecolgroup>
 			  <treecol id="CheckboxColumn" flex="1"/>
-			  <treecol id="NameColumn" rdf:resource="http://home.netscape.com/NC-rdf#Name" sortActive="true" sortDirection="ascending" flex="1"/>
-			  <treecol id="DescColumn" rdf:resource="http://home.netscape.com/NC-rdf#Description" rdf:resource2="http://home.netscape.com/NC-rdf#Name" flex="1"/>
+			  <treecol id="NameColumn" resource="http://home.netscape.com/NC-rdf#Name" sortActive="true" sortDirection="ascending" flex="1"/>
+			  <treecol id="DescColumn" resource="http://home.netscape.com/NC-rdf#Description" resource2="http://home.netscape.com/NC-rdf#Name" flex="1"/>
                         </treecolgroup>
 
 			<template>
diff --git a/mozilla/xpfe/components/search/resources/internetresults.xul b/mozilla/xpfe/components/search/resources/internetresults.xul
index 7802f8ec58e..0b5c97d2539 100644
--- a/mozilla/xpfe/components/search/resources/internetresults.xul
+++ b/mozilla/xpfe/components/search/resources/internetresults.xul
@@ -54,32 +54,32 @@
 		onselect="treeSelect(event);" onclick="treeClick(event);">
 
   <treecolgroup>
-    <treecol id="NameColumn" rdf:resource="http://home.netscape.com/NC-rdf#Name" flex="1"/>
+    <treecol id="NameColumn" resource="http://home.netscape.com/NC-rdf#Name" flex="1"/>
     <splitter class="tree-splitter"/>
-    <treecol id="PageRankColumn" rdf:resource="http://home.netscape.com/NC-rdf#PageRank"
-             rdf:resource2="http://home.netscape.com/NC-rdf#Name" flex="1"/>
+    <treecol id="PageRankColumn" resource="http://home.netscape.com/NC-rdf#PageRank"
+             resource2="http://home.netscape.com/NC-rdf#Name" flex="1"/>
     <splitter class="tree-splitter"/>
-    <treecol id="RelevanceColumn" rdf:resource="http://home.netscape.com/NC-rdf#Relevance"
-             rdf:resource2="http://home.netscape.com/NC-rdf#Name"
+    <treecol id="RelevanceColumn" resource="http://home.netscape.com/NC-rdf#Relevance"
+             resource2="http://home.netscape.com/NC-rdf#Name"
              style="width: 0; visibility: collapse;" flex="1"/>
     <splitter class="tree-splitter"/>
-    <treecol id="PriceColumn" rdf:resource="http://home.netscape.com/NC-rdf#Price"
-             rdf:resource2="http://home.netscape.com/NC-rdf#Availability"
+    <treecol id="PriceColumn" resource="http://home.netscape.com/NC-rdf#Price"
+             resource2="http://home.netscape.com/NC-rdf#Availability"
              style="width: 0; visibility: collapse;" flex="1"/>
     <splitter class="tree-splitter"/>
-    <treecol id="AvailabilityColumn" rdf:resource="http://home.netscape.com/NC-rdf#Availability"
-             rdf:resource2="http://home.netscape.com/NC-rdf#Price"
+    <treecol id="AvailabilityColumn" resource="http://home.netscape.com/NC-rdf#Availability"
+             resource2="http://home.netscape.com/NC-rdf#Price"
              style="width: 0; visibility: collapse;" flex="1"/>
     <splitter class="tree-splitter"/>
-    <treecol id="DateColumn" rdf:resource="http://home.netscape.com/NC-rdf#Date"
-             rdf:resource2="http://home.netscape.com/NC-rdf#Name"
+    <treecol id="DateColumn" resource="http://home.netscape.com/NC-rdf#Date"
+             resource2="http://home.netscape.com/NC-rdf#Name"
              style="width: 0; visibility: collapse;" flex="1"/>
     <splitter class="tree-splitter"/>
-    <treecol id="SiteColumn" rdf:resource="http://home.netscape.com/NC-rdf#Site"
-             rdf:resource2="http://home.netscape.com/NC-rdf#Name" flex="1"/>
+    <treecol id="SiteColumn" resource="http://home.netscape.com/NC-rdf#Site"
+             resource2="http://home.netscape.com/NC-rdf#Name" flex="1"/>
     <splitter class="tree-splitter"/>
-    <treecol id="EngineColumn" rdf:resource="http://home.netscape.com/NC-rdf#Engine"
-             rdf:resource2="http://home.netscape.com/NC-rdf#Name" flex="1"/>
+    <treecol id="EngineColumn" resource="http://home.netscape.com/NC-rdf#Engine"
+             resource2="http://home.netscape.com/NC-rdf#Name" flex="1"/>
   </treecolgroup>
 
 		<template>
diff --git a/mozilla/xpfe/components/search/resources/search-editor.xul b/mozilla/xpfe/components/search/resources/search-editor.xul
index 9ddd7e7a728..d8b00df163c 100644
--- a/mozilla/xpfe/components/search/resources/search-editor.xul
+++ b/mozilla/xpfe/components/search/resources/search-editor.xul
@@ -63,7 +63,7 @@
       </template>
     
       <treecolgroup>
-        <treecol id="NameColumn" rdf:resource="http://home.netscape.com/NC-rdf#Name" sortActive="true" sortDirection="ascending" flex="1"/>
+        <treecol id="NameColumn" resource="http://home.netscape.com/NC-rdf#Name" sortActive="true" sortDirection="ascending" flex="1"/>
       </treecolgroup>
     
       <treehead>
@@ -120,7 +120,7 @@
             </treechildren>
           </template>
           
-          <treecol id="EngineColumn" rdf:resource="http://home.netscape.com/NC-rdf#Name" flex="1" />
+          <treecol id="EngineColumn" resource="http://home.netscape.com/NC-rdf#Name" flex="1" />
         
           <treehead>
             <treerow>
diff --git a/mozilla/xpfe/components/search/resources/search-panel.xul b/mozilla/xpfe/components/search/resources/search-panel.xul
index 2367a250929..e06a3ac5d46 100644
--- a/mozilla/xpfe/components/search/resources/search-panel.xul
+++ b/mozilla/xpfe/components/search/resources/search-panel.xul
@@ -88,8 +88,8 @@
   <deck class="outset-right" id="advancedDeck" flex="1">
     <box align="vertical" class="searchpanel-outerbox" flex="1">
       <tree id="Tree" class="inset" ref="NC:LastSearchRoot"
-            rdf:resource="http://home.netscape.com/NC-rdf#PageRank"
-            rdf:resource2="http://home.netscape.com/NC-rdf#Name"
+            resource="http://home.netscape.com/NC-rdf#PageRank"
+            resource2="http://home.netscape.com/NC-rdf#Name"
             sortDirection="ascending" sortActive="true"
             flex="1" datasources="rdf:internetsearch" context="contextual"
             onclick="sidebarOpenURL(event, event.target.parentNode.parentNode, 'Tree')">
@@ -134,8 +134,8 @@
         </treehead>
       
         <treecolgroup>
-          <treecol flex="1" rdf:resource="http://home.netscape.com/NC-rdf#PageRank" rdf:resource2="http://home.netscape.com/NC-rdf#Name" />
-          <treecol width="0" id="SortNameColumn" rdf:resource="http://home.netscape.com/NC-rdf#Name" />
+          <treecol flex="1" resource="http://home.netscape.com/NC-rdf#PageRank" resource2="http://home.netscape.com/NC-rdf#Name" />
+          <treecol width="0" id="SortNameColumn" resource="http://home.netscape.com/NC-rdf#Name" />
         </treecolgroup>
       </tree>
       
@@ -168,7 +168,7 @@
         </template>
         
         <treecolgroup>
-          <treecol id="EngineColumn" rdf:resource="http://home.netscape.com/NC-rdf#Name" flex="1" />
+          <treecol id="EngineColumn" resource="http://home.netscape.com/NC-rdf#Name" flex="1" />
         </treecolgroup>
         
         <treehead>