Bug 337076: Place window leaks 3 PrefHandlers, patch by Regis Caspar <regis.caspar+bz@gmail.com>, r=annie/mano

browser/components/places/content/places.js

@@ -77,6 +77,9 @@ var PlacesOrganizer = {
     PlacesQueryBuilder.init();
   },
   
+  destroy: function PO_destroy() {
+    OptionsFilter.destroy();
+  },
   
   HEADER_TYPE_SHOWING: 1,
   HEADER_TYPE_SEARCH: 2,

browser/components/places/content/places.xul

@@ -51,6 +51,7 @@
         windowtype="Places:Organizer" 
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="PlacesOrganizer.init();"
+        onunload="PlacesOrganizer.destroy();"
         width="700" height="500" screenX="10" screenY="10"
         persist="width height screenX screenY sizemode">
   

browser/components/places/content/treeHelpers.js

@@ -219,6 +219,15 @@ var OptionsFilter = {
                       defaultSubscriptionsOptions, this);
   },
   
+  /**
+   * Destroy the OptionsFilter handlers (to avoid leaks).
+   */
+  destroy: function OF_destroy() {
+    this.historyHandler.destroy();
+    this.bookmarksHandler.destroy();
+    this.overrideHandlers["livemark/"].destroy();
+  },
+  
   /**
    * Gets the handler best able to store options for a set of queries that are
    * about to be executed.