From 7038dc011bc70e1f0437bd5867b6a0766e40a359 Mon Sep 17 00:00:00 2001
From: "annie.sullivan%gmail.com" <annie.sullivan%gmail.com>
Date: Tue, 7 Mar 2006 18:41:38 +0000
Subject: [PATCH] Bug 328779: Statusbar text for bookmark menu items, Patch by
 Dave Townsend <mossop@blueprintit.co.uk> r=annie.sullivan@gmail.com
 sr=ben@mozilla.org

---
 browser/components/places/content/menu.xml    | 4 ++--
 browser/components/places/content/toolbar.xml | 2 +-
 browser/components/places/content/tree.xml    | 7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/browser/components/places/content/menu.xml b/browser/components/places/content/menu.xml
index 2d119fdb7ca9..257046cc1964 100755
--- a/browser/components/places/content/menu.xml
+++ b/browser/components/places/content/menu.xml
@@ -165,7 +165,7 @@
                 element = document.createElementNS(XULNS, "menuitem");
                 element.setAttribute("label", child.title);
                 element.setAttribute("url", child.uri);
-                element.setAttribute("statustext", child.url);
+                element.setAttribute("statustext", child.uri);
                 element.className = "menuitem-iconic bookmark-item";
               }
               else if (PlacesController.nodeIsSeparator(child)) {
@@ -605,7 +605,7 @@
           for (var i = 0; i < this._self.supportedDropTypes.length; ++i)
             flavorSet.appendFlavour(this._self.supportedDropTypes[i]);
           return flavorSet;
-        },
+        }
         
       })]]></field>
       
diff --git a/browser/components/places/content/toolbar.xml b/browser/components/places/content/toolbar.xml
index 0f6469169737..55b866d7a670 100755
--- a/browser/components/places/content/toolbar.xml
+++ b/browser/components/places/content/toolbar.xml
@@ -602,7 +602,7 @@
           for (var i = 0; i < this._self.supportedDropTypes.length; ++i)
             flavorSet.appendFlavour(this._self.supportedDropTypes[i]);
           return flavorSet;
-        },
+        }
         
       })]]></field>
       
diff --git a/browser/components/places/content/tree.xml b/browser/components/places/content/tree.xml
index 22411217d467..11ce009c2938 100644
--- a/browser/components/places/content/tree.xml
+++ b/browser/components/places/content/tree.xml
@@ -61,6 +61,7 @@
             return this.view.QueryInterface(Ci.nsINavHistoryResult);
           }
           catch (e) {
+            return null;
           }
         ]]></body>
       </method>
@@ -480,8 +481,8 @@
             var dragService = 
                 Cc["@mozilla.org/widget/dragservice;1"].
                 getService(Ci.nsIDragService);
-            var session = dragService.getCurrentSession();
-            session.canDrop = this._viewObserver.canDrop(-1, 1);
+            var dragSession = dragService.getCurrentSession();
+            dragSession.canDrop = this._viewObserver.canDrop(-1, 1);
           }
         ]]></body>
       </method>
@@ -669,7 +670,7 @@
         onCycleCell: function VO_onCycleCell(row, column) { },
         onPerformAction: function VO_onPerformAction(action) { },
         onPerformActionOnRow: function VO_onPerformActionOnRow(action, row) { },
-        onPerformActionOnCell: function VO_onPerformActionOnCell(action, row, column) { },      
+        onPerformActionOnCell: function VO_onPerformActionOnCell(action, row, column) { }
       })]]></field>
       
       <field name="_nextSelection">[]</field>