Fix for bug 152209. unnecessary distinction between "content" and "treeitem" template conditions

r=neil, sr=bienvenu

content/xul/templates/src/nsXULTreeBuilder.cpp

@@ -1400,7 +1400,7 @@ nsXULTreeBuilder::CompileCondition(nsIAtom* aTag,
 {
     nsresult rv;
 
-    if (aTag == nsXULAtoms::treeitem)
+    if (aTag == nsXULAtoms::content || aTag == nsXULAtoms::treeitem)
         rv = CompileTreeRowCondition(aRule, aCondition, aParentNode, aResult);
     else
         rv = nsXULTemplateBuilder::CompileCondition(aTag, aRule, aCondition, aParentNode, aResult);
@@ -1414,9 +1414,9 @@ nsXULTreeBuilder::CompileTreeRowCondition(nsTemplateRule* aRule,
                                                   InnerNode* aParentNode,
                                                   TestNode** aResult)
 {
-    // Compile a <treeitem> condition, which must be of the form:
+    // Compile a <content> condition, which must be of the form:
     //
-    //   <treeitem uri="?uri" />
+    //   <content uri="?uri" />
     //
     // Right now, exactly one <row> condition is required per rule. It
     // creates an nsTreeRowTestNode, binding the test's variable

extensions/help/resources/content/help.xul

@@ -134,7 +134,7 @@
         <template>
           <rule>
           <conditions>
-            <treeitem uri="?uri"/>
+            <content uri="?uri"/>
             <triple subject="?uri"
               predicate="http://home.netscape.com/NC-rdf#subheadings"
               object="?subheadings" />
@@ -182,7 +182,7 @@
         <template>
           <rule>
           <conditions>
-            <treeitem uri="?uri"/>
+            <content uri="?uri"/>
             <triple subject="?uri"
               predicate="http://home.netscape.com/NC-rdf#subheadings"
               object="?subheadings" />
@@ -243,7 +243,7 @@
             <template>
               <rule>
                 <conditions>
-                  <treeitem uri="?uri"/>
+                  <content uri="?uri"/>
                   <member container="?uri" child="?subheading" />
                 </conditions>
 
@@ -291,7 +291,7 @@
           <template>
             <rule>
               <conditions>
-               <treeitem uri="?uri"/>
+               <content uri="?uri"/>
                <triple subject="?uri"
                  predicate="http://home.netscape.com/NC-rdf#subheadings"
                  object="?subheadings" />

extensions/transformiix/resources/buster/buster.xul

@@ -150,7 +150,7 @@
   <template>
     <rule>
       <conditions>
-        <treeitem uri="?uri" />
+        <content uri="?uri" />
         <member container="?uri" child="?subheading" />
         <triple subject="?subheading"
                 predicate="http://home.netscape.com/NC-rdf#purp"
@@ -186,7 +186,7 @@
     </rule>
     <rule>
       <conditions>
-        <treeitem uri="?uri" />
+        <content uri="?uri" />
         <member container="?uri" child="?subheading" />
       </conditions>
 

mailnews/addrbook/resources/content/abDirTreeOverlay.xul

@@ -51,7 +51,7 @@ Contributors:
     <template>
       <rule>
         <conditions>
-          <treeitem uri="?container"/>
+          <content uri="?container"/>
           <member container="?container" child="?member"/>
         </conditions>
 

mailnews/base/resources/content/folderPane.xul

@@ -43,7 +43,7 @@
     <template>
       <rule>
         <conditions>
-          <treeitem uri="?container"/>
+          <content uri="?container"/>
           <member container="?container" child="?member" />
         </conditions>
 

mailnews/base/resources/content/msgSelectOffline.xul

@@ -60,7 +60,7 @@ Contributors:
       <template>
         <rule>
           <conditions>
-            <treeitem uri="?container"/>
+            <content uri="?container"/>
             <member container="?container" child="?member"/>
             <triple subject="?member" predicate="http://home.netscape.com/NC-rdf#SupportsOffline" object="true"/>
           </conditions>

mailnews/base/resources/content/subscribe.xul

@@ -100,7 +100,7 @@ Rights Reserved.
           <template>
             <rule>
               <conditions>
-                <treeitem uri="?container"/>
+                <content uri="?container"/>
                 <member container="?container" child="?member"/>
               </conditions>
               

mailnews/base/search/resources/content/FilterListDialog.xul

@@ -126,7 +126,7 @@ Contributor(s):  Håkan Waara <hwaara@chello.se>
             <template>
               <rule>
                 <conditions>
-                  <treeitem uri="?container"/>
+                  <content uri="?container"/>
                   <member container="?container" child="?member"/>
                 </conditions>