Bug 431140 - dropping a bookmark or folder in the library window causes flickering (for mak77@supereva.it, r=mano, a=mconnor)

browser/components/places/content/places.js

@@ -230,7 +230,8 @@ var PlacesOrganizer = {
     }
 
     this._setSearchScopeForNode(node);
-    this._fillDetailsPane(node);
+    if (this._places.treeBoxObject.focused)
+      this._fillDetailsPane(node);
   },
 
   /**
@@ -619,7 +620,8 @@ var PlacesOrganizer = {
   },
 
   onContentTreeSelect: function PO_onContentTreeSelect() {
-    this._fillDetailsPane(this._content.selectedNode);
+    if (this._content.treeBoxObject.focused)
+      this._fillDetailsPane(this._content.selectedNode);
   },
 
   _fillDetailsPane: function PO__fillDetailsPane(aSelectedNode) {

browser/components/places/content/treeView.js

@@ -327,10 +327,9 @@ PlacesTreeView.prototype = {
     }
 
     // now update the number of elements
-    if (previouslySelectedNodes.length > 0)
-      selection.selectEventsSuppressed = true;
-
+    selection.selectEventsSuppressed = true;
     this._tree.beginUpdateBatch();
+
     if (replaceCount)
       this._tree.rowCountChanged(startReplacement, -replaceCount);
     if (newElements.length)
@@ -349,8 +348,8 @@ PlacesTreeView.prototype = {
         }
         // if we don't have a parent, we made it all the way to the root
         // and didn't find a match, so we can open our item
-        if (!parent)
-          item.containerOpen = !item.containerOpen;
+        if (!parent && !item.containerOpen)
+          item.containerOpen = true;
       }
     }
 
@@ -394,9 +393,8 @@ PlacesTreeView.prototype = {
         selection.rangedSelect(previouslySelectedNodes[0].oldIndex,
                                previouslySelectedNodes[0].oldIndex, true);
       }
-
-      selection.selectEventsSuppressed = false;
     }
+    selection.selectEventsSuppressed = false;
   },
 
   _convertPRTimeToString: function PTV__convertPRTimeToString(aTime) {