From 7843a56ccb281bc0b472ffcf2d901a9ad6ee80f3 Mon Sep 17 00:00:00 2001 From: "gavin%gavinsharp.com" Date: Sat, 18 Feb 2006 00:13:55 +0000 Subject: [PATCH] Bug 235204, remove pref observer to avoid a crash (bug 306135), r=mano git-svn-id: svn://10.0.0.236/trunk@190455 18797224-902f-48f8-a5cc-f745e15eee43 --- .../components/search/content/search.xml | 22 ------------------- .../search/content/searchDialog.css | 6 ++--- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/mozilla/browser/components/search/content/search.xml b/mozilla/browser/components/search/content/search.xml index fa68473aa7c..edae7ce891c 100644 --- a/mozilla/browser/components/search/content/search.xml +++ b/mozilla/browser/components/search/content/search.xml @@ -113,7 +113,6 @@ // there may not be anything to remove here try { this.controllers.removeController(this.searchbarController); - this.mPrefObserver.unregister(); } catch (ex) { } ]]> @@ -140,7 +139,6 @@ .getService(Components.interfaces.nsIPrefBranch2); this._initializeEngine(); - this.mPrefObserver.register(); var element; element = document.createElementNS(XUL_NS, "menuseparator"); @@ -184,25 +182,6 @@ - @@ -264,7 +243,6 @@ // because the searchbar isn't currently destroyed when // removed from the toolbar if (!this.parentNode) { - this.mPrefObserver.unregister(); return false; } diff --git a/mozilla/browser/components/search/content/searchDialog.css b/mozilla/browser/components/search/content/searchDialog.css index f7edebb9dd8..52f6ce69dda 100644 --- a/mozilla/browser/components/search/content/searchDialog.css +++ b/mozilla/browser/components/search/content/searchDialog.css @@ -1,5 +1,5 @@ /* ***** BEGIN LICENSE BLOCK ***** -#if 0 +%if 0 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * * The contents of this file are subject to the Mozilla Public License Version @@ -33,10 +33,10 @@ * the provisions above, a recipient may use your version of this file under * the terms of any one of the MPL, the GPL or the LGPL. * -#endif +%endif * ***** END LICENSE BLOCK ***** */ - #searchEngineList { +#searchEngineList { min-height: 24px; }