From 5f98068a63ea75749c1dc21761ee7aeeeaef212b Mon Sep 17 00:00:00 2001
From: "neil%parkwaycc.co.uk"
 <neil%parkwaycc.co.uk@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 22 Dec 2007 11:57:49 +0000
Subject: [PATCH] Bug 401968 Exclude unnamed topics from help viewer r=Waldo
 a=mconnor (over IRC)

git-svn-id: svn://10.0.0.236/trunk@242010 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/toolkit/components/help/content/help.js  | 5 +++--
 mozilla/toolkit/components/help/content/help.xul | 8 +++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/mozilla/toolkit/components/help/content/help.js b/mozilla/toolkit/components/help/content/help.js
index 295cd8392c7..fa5c69bfb44 100644
--- a/mozilla/toolkit/components/help/content/help.js
+++ b/mozilla/toolkit/components/help/content/help.js
@@ -689,9 +689,10 @@ function doFindOnSeq(resultsDS, sourceDS, resource, level) {
         var target = targets.getNext();
         var link = sourceDS.GetTarget(target, NC_LINK, true);
         var name = sourceDS.GetTarget(target, NC_NAME, true);
-        name = name.QueryInterface(Components.interfaces.nsIRDFLiteral);
 
-        if (link && isMatch(name.Value)) {
+        if (link &&
+            name instanceof Components.interfaces.nsIRDFLiteral &&
+            isMatch(name.Value)) {
             // we have found a search entry - add it to the results datasource.
             var urn = RDF.GetAnonymousResource();
             resultsDS.Assert(urn, NC_NAME, name, true);
diff --git a/mozilla/toolkit/components/help/content/help.xul b/mozilla/toolkit/components/help/content/help.xul
index 5460d3727ee..fe833e9162e 100644
--- a/mozilla/toolkit/components/help/content/help.xul
+++ b/mozilla/toolkit/components/help/content/help.xul
@@ -209,12 +209,10 @@
                           object="?subheadings"/>
                   <member container="?subheadings"
                           child="?subheading"/>
+                  <triple subject="?subheading"
+                          predicate="http://home.netscape.com/NC-rdf#name"
+                          object="?name"/>
                 </conditions>
-                <bindings>
-                  <binding subject="?subheading"
-                           predicate="http://home.netscape.com/NC-rdf#name"
-                           object="?name"/>
-                </bindings>
                 <action>
                   <treechildren>
                     <treeitem uri="?subheading">