Bug 901234 - Stop using uriTypes (Places Session ids) in SeaMonkey co…

…de, r=Neil, a=me CLOSED TREE
mozilla · Mar 5, 2014 · 9559a28 · 9559a28
1 parent c18a7b2
commit 9559a28
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/suite/common/history/utils.js b/suite/common/history/utils.js
@@ -289,7 +289,7 @@ var PlacesUIUtils = {
 
   getBestTitle: function PU_getBestTitle(aNode) {
     var title;
-    if (!aNode.title && PlacesUtils.uriTypes.indexOf(aNode.type) != -1) {
+    if (!aNode.title && PlacesUtils.nodeIsURI(aNode)) {
       // if node title is empty, try to set the label using host and filename
       // PlacesUtils._uri() will throw if aNode.uri is not a valid URI
       try {

diff --git a/suite/common/places/browserPlacesViews.js b/suite/common/places/browserPlacesViews.js
@@ -295,7 +295,7 @@ PlacesViewBase.prototype = {
     if (type == Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_SEPARATOR)
       element = document.createElement("menuseparator");
     else {
-      if (PlacesUtils.uriTypes.indexOf(type) != -1) {
+      if (type == Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_URI) {
         element = document.createElement("menuitem");
         element.className = "menuitem-iconic bookmark-item menuitem-with-favicon";
         element.setAttribute("scheme",

diff --git a/suite/common/places/controller.js b/suite/common/places/controller.js
@@ -461,7 +461,6 @@ PlacesController.prototype = {
           nodeData["separator"] = true;
           break;
         case Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_URI:
-        case Components.interfaces.nsINavHistoryResultNode.RESULT_TYPE_VISIT:
           nodeData["link"] = true;
           uri = PlacesUtils._uri(node.uri);
           if (PlacesUtils.nodeIsBookmark(node)) {

diff --git a/suite/common/places/tree.xml b/suite/common/places/tree.xml
@@ -62,7 +62,7 @@
           if (PlacesUtils.nodeIsHistoryContainer(queryNode) ||
               options.resultType == options.RESULTS_AS_TAG_QUERY ||
               options.resultType == options.RESULTS_AS_TAG_CONTENTS)
-            options.resultType = options.RESULT_TYPE_URI;
+            options.resultType = options.RESULTS_AS_URI;
 
           var query = PlacesUtils.history.getNewQuery();
           query.searchTerms = filterString;

diff --git a/suite/common/src/PlacesUIUtils.jsm b/suite/common/src/PlacesUIUtils.jsm
@@ -895,7 +895,7 @@ var PlacesUIUtils = {
 
   getBestTitle: function PUIU_getBestTitle(aNode) {
     var title;
-    if (!aNode.title && PlacesUtils.uriTypes.indexOf(aNode.type) != -1) {
+    if (!aNode.title && PlacesUtils.nodeIsURI(aNode)) {
       // if node title is empty, try to set the label using host and filename
       // PlacesUtils._uri() will throw if aNode.uri is not a valid URI
       try {