Bug 418120 - Double click on bookmark item in places library does not open in main window. r=dietrich.

browser/components/places/content/places.js

@@ -257,12 +257,8 @@ var PlacesOrganizer = {
       this._places.selectPlaceURI(aContainer.uri);
   },
 
-  onContentTreeKeypress: function PO_onContentTreeKeypress(aEvent) {
-    if (aEvent.keyCode == KeyEvent.DOM_VK_RETURN) {
-      var node = this._content.selectedNode;
-      if (node && PlacesUtils.nodeIsURI(node))
-        this._content.controller.openSelectedNodeWithEvent(aEvent);
-    }
+  openSelectedNode: function PU_openSelectedNode(aEvent) {
+    this._content.controller.openSelectedNodeWithEvent(aEvent);
   },
 
   /**

browser/components/places/content/places.xul

@@ -418,7 +418,8 @@
             <tree id="placeContent" class="placesTree" context="placesContext" 
                   flex="1" type="places"
                   flatList="true"
-                  onkeypress="PlacesOrganizer.onContentTreeKeypress(event);"
+                  onkeypress="if (event.keyCode == KeyEvent.DOM_VK_RETURN) PlacesOrganizer.openSelectedNode(event);"
+                  ondblclick="PlacesOrganizer.openSelectedNode(event);"
                   onopenflatcontainer="PlacesOrganizer.openFlatContainer(aContainer);"
                   onselect="PlacesOrganizer.onContentTreeSelect();"
                   onclick="PlacesOrganizer.onTreeClick(event);">