Bug 480826 - Firefox should honour browser.chrome.favicons setting when opening Edit->Preferences->Applications. r=mconnor
authormail@bugz.ata.myota.org
Thu, 13 Aug 2009 09:53:47 +0200
changeset 31423 52d5e6ab0cfea58801eb317790b19ed16b427509
parent 31422 3511005c7340c18675b155cc5557e5f00d1e6073
child 31424 bc03cb3fd8ba3593ed031f526f950e4eca89775f
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 17:57:20 +0000
reviewersmconnor
bugs480826
milestone1.9.2a2pre
Bug 480826 - Firefox should honour browser.chrome.favicons setting when opening Edit->Preferences->Applications. r=mconnor
browser/components/preferences/applications.js
--- a/browser/components/preferences/applications.js
+++ b/browser/components/preferences/applications.js
@@ -1870,17 +1870,17 @@ var gApplicationsPane = {
 
     // Unfortunately we can't use the favicon service to get the favicon,
     // because the service looks in the annotations table for a record with
     // the exact URL we give it, and users won't have such records for URLs
     // they don't visit, and users won't visit the web app's URL template,
     // they'll only visit URLs derived from that template (i.e. with %s
     // in the template replaced by the URL of the content being handled).
 
-    if (/^https?/.test(uri.scheme))
+    if (/^https?/.test(uri.scheme) && this._prefSvc.getBoolPref("browser.chrome.favicons"))
       return uri.prePath + "/favicon.ico";
 
     return "";
   },
 
   _getIconURLForSystemDefault: function(aHandlerInfo) {
     // Handler info objects for MIME types on some OSes implement a property bag
     // interface from which we can get an icon for the default app, so if we're