From b8d102ee13d5e2c7ce7e41cbf3d8d98ad2fce3e1 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mak77@bonardo.net>
Date: Fri, 21 Nov 2008 01:56:21 +0100
Subject: [PATCH] Bug 465693 - Dragging a bookmark from the bookmarks toolbar
 to tabstrip breaks bookmarks toolbar, r=dietrich a=beltzner, CLOSED TREE

---
 browser/components/places/content/toolbar.xml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/browser/components/places/content/toolbar.xml b/browser/components/places/content/toolbar.xml
index 1246a57b03d..7ac1801cdf6 100755
--- a/browser/components/places/content/toolbar.xml
+++ b/browser/components/places/content/toolbar.xml
@@ -1122,11 +1122,6 @@
       ]]></handler>
 
       <handler event="dragleave"><![CDATA[
-        // Only handle dragleaves for the toolbar itself (and not for its child
-        // nodes)
-        if (event.target != this)
-          return;
-
         PlacesControllerDragHelper.currentDropTarget = null;
         PlacesControllerDragHelper.currentDataTransfer = null;
 
@@ -1137,10 +1132,12 @@
           this._ibTimer.cancel();
         this._ibTimer = this._setTimer(10);
 
-        // Close any folder being hovered over
+        // If we hovered over a folder, close it now
         if (this._overFolder.node)
             this._overFolder.closeTimer = this._setTimer(this._overFolder.hoverTime);
+      ]]></handler>
 
+      <handler event="dragend"><![CDATA[
         this._draggedNode = null;
       ]]></handler>