From 6349a53b1ebbc80e9bc49c9ddf2eb20a3c873dab Mon Sep 17 00:00:00 2001
From: Gavin Sharp <gavin@gavinsharp.com>
Date: Thu, 17 Dec 2009 15:59:45 -0500
Subject: [PATCH] Bug 534914: don't display "smart folders" or bookmark
 separators in our bookmark list since they aren't useful, r=mfinkle

---
 mobile/chrome/content/bindings.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/mobile/chrome/content/bindings.xml b/mobile/chrome/content/bindings.xml
index 889d2bd4bba..68c9a4aef4c 100644
--- a/mobile/chrome/content/bindings.xml
+++ b/mobile/chrome/content/bindings.xml
@@ -805,17 +805,27 @@
 
             let options = PlacesUtils.history.getNewQueryOptions();
             options.queryType = (this._type == "bookmarks" ? options.QUERY_TYPE_BOOKMARKS : options.QUERY_TYPE_HISTORY);
+
+            // Exclude "query" items (e.g. "smart folders")
+            options.excludeQueries = true;
+
             let query = PlacesUtils.history.getNewQuery();
 
             if (aFolder)
               query.setFolders([aFolder], 1);
+
             let result = PlacesUtils.history.executeQuery(query, options);
             let rootNode = result.root;
             rootNode.containerOpen = true;
     
             let cc = rootNode.childCount;
             for (var i=0; i<cc; ++i) {
-              var node = rootNode.getChild(i);
+              let node = rootNode.getChild(i);
+
+              // Ignore separators
+              if (node.type == node.RESULT_TYPE_SEPARATOR)
+                continue;
+
               if (this._mode == "folders" && node.type == node.RESULT_TYPE_FOLDER) {
                 items.push(node);
               }