Bug 337029: bookmark properties dialog leaks a microsummaryObserver when canceled, patch by Regis Caspar <regis.caspar+bz@gmail.com>, r=annie, r=mconnor

git-svn-id: svn://10.0.0.236/trunk@198298 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/browser/components/places/content/bookmarkProperties.js

@@ -652,6 +652,12 @@ var BookmarkPropertiesPanel = {
     this._saveChanges();
     this._hideBookmarkProperties();
   },
+  
+  dialogCancel: function BPP_dialogCancel() {
+    if (this._isMicrosummaryVisible() && this._microsummaries)
+      this._microsummaries.removeObserver(this._microsummaryObserver);
+    this._hideBookmarkProperties();
+  },
 
   /**
    * This method deletes the bookmark corresponding to the URI stored

mozilla/browser/components/places/content/bookmarkProperties.xul

@@ -17,6 +17,7 @@
         buttons="accept, cancel, extra1"
         buttonlabelextra1="&cmd.delete_bookmark.label;"
         ondialogaccept="BookmarkPropertiesPanel.dialogDone();"
+        ondialogcancel="BookmarkPropertiesPanel.dialogCancel();"
         ondialogextra1="BookmarkPropertiesPanel.dialogDeleteBookmark();"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="BookmarkPropertiesPanel.init(window, window.arguments[0], window.arguments[1], window.arguments[2]);">