Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-08 22:08:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 4d2cefab5e0f (bug 960864) CLOSED TREE

Browse Source
This commit is contained in:
Gavin Sharp 2014-01-18 19:00:27 -08:00
parent 765d86ae0c
commit 9d4b153953
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
browser/components/search/content/search.xml
View File

@ -84,7 +84,7 @@
.getService(Components.interfaces.nsIObserverService); .getService(Components.interfaces.nsIObserverService);
os.addObserver(this, "browser-search-engine-modified", false); os.addObserver(this, "browser-search-engine-modified", false);
this._destroyed = false; this._addedObserver = true;
this.searchService.init((function search_init_cb(aStatus) { this.searchService.init((function search_init_cb(aStatus) {
// Bail out if the binding's been destroyed // Bail out if the binding's been destroyed
@ -103,9 +103,12 @@
<destructor><![CDATA[ <destructor><![CDATA[
this._destroyed = true; this._destroyed = true;
var os = Components.classes["@mozilla.org/observer-service;1"] if (this._addedObserver) {
.getService(Components.interfaces.nsIObserverService); var os = Components.classes["@mozilla.org/observer-service;1"]
os.removeObserver(this, "browser-search-engine-modified"); .getService(Components.interfaces.nsIObserverService);
os.removeObserver(this, "browser-search-engine-modified");
this._addedObserver = false;
}
// Make sure to break the cycle from _textbox to us. Otherwise we leak // Make sure to break the cycle from _textbox to us. Otherwise we leak
// the world. But make sure it's actually pointing to us. // the world. But make sure it's actually pointing to us.