From db8b7f1629aa38a07aac06e359e7b407304c6d24 Mon Sep 17 00:00:00 2001
From: "mozilla.mano@sent.com" <mozilla.mano@sent.com>
Date: Sat, 19 May 2007 13:29:48 -0700
Subject: [PATCH] Yet another attempt to fix result & result nodes leaks (see
 bug 381239 comment 13)

---
 browser/components/places/content/menu.xml    | 1 +
 browser/components/places/content/toolbar.xml | 1 +
 browser/components/places/content/tree.xml    | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/browser/components/places/content/menu.xml b/browser/components/places/content/menu.xml
index 4d08e84e8b28..af0ed8352f35 100755
--- a/browser/components/places/content/menu.xml
+++ b/browser/components/places/content/menu.xml
@@ -63,6 +63,7 @@
       
       <destructor><![CDATA[
         this._result = null;
+        this._resultNode = null;
       ]]></destructor>
 
       <method name="_init">
diff --git a/browser/components/places/content/toolbar.xml b/browser/components/places/content/toolbar.xml
index 640800d1a548..bae0f169138f 100755
--- a/browser/components/places/content/toolbar.xml
+++ b/browser/components/places/content/toolbar.xml
@@ -104,6 +104,7 @@
         this.genericAnnoObserver.removeObserver("bookmarks/generatedTitle",
                                                 this._generatedTitleAnnoObserver);
         PlacesUtils.annotations.removeObserver(this.genericAnnoObserver);
+        this._result.viewer = null;
         this._result = null;
       ]]></destructor>
 
diff --git a/browser/components/places/content/tree.xml b/browser/components/places/content/tree.xml
index 4beb15f8e88f..0e275af344e0 100644
--- a/browser/components/places/content/tree.xml
+++ b/browser/components/places/content/tree.xml
@@ -58,7 +58,8 @@
       ]]></constructor>
 
       <destructor><![CDATA[ 
-        this._result.view = null;
+        this._result.viewer = null;
+        this.view = null;
         this._result = null;
       ]]></destructor>