Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 300561 Handle broken default search engine pref value

Browse Source 
Patch by ajschult, r=neil a=asa


git-svn-id: svn://10.0.0.236/trunk@176075 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cst%andrew.cmu.edu 2005-07-14 01:36:32 +00:00
parent af6df60f90
commit 5d3fd9b7db
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mozilla/xpfe/browser/resources/content/urlbarBindings.xml
View File

@ -216,9 +216,9 @@
defaultEngine = this.mPrefs.getComplexValue("browser.search.defaultengine",
Components.interfaces.nsISupportsString).data;
} catch(ex) {
// this will re-invoke updateEngines via the pref observer if the pref changes
this.ensureDefaultEnginePrefs(rdf, ds);
defaultEngine = this.mPrefs.getComplexValue("browser.search.defaultengine",
Components.interfaces.nsISupportsString).data;
return;
}
if (defaultEngine) {
@ -231,10 +231,15 @@
} catch(ex) {
searchBarUrl = null;
}
this.addEngine(res.Value,
this.readRDFString(ds, res, kNC_Name),
this.readRDFString(ds, res, kNC_Icon),
searchBarUrl);
if (searchBarUrl == null) {
// this will re-invoke updateEngines via the pref observer if the pref changes
this.ensureDefaultEnginePrefs(rdf, ds);
return;
}
this.addEngine(res.Value,
this.readRDFString(ds, res, kNC_Name),
this.readRDFString(ds, res, kNC_Icon),
searchBarUrl);
}
}