From df7df362e08f533492716c4e409a33eac250b2a1 Mon Sep 17 00:00:00 2001 From: "mozilla.mano%sent.com" Date: Tue, 2 Jan 2007 00:33:43 +0000 Subject: [PATCH] Bug 365570 - FeedWriter doesn't work with handlers with chrome:// URI (throws exception when downloading favicon). r=gavin. git-svn-id: svn://10.0.0.236/trunk@217593 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/browser/components/feeds/src/FeedWriter.js | 2 +- mozilla/browser/components/preferences/feeds.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mozilla/browser/components/feeds/src/FeedWriter.js b/mozilla/browser/components/feeds/src/FeedWriter.js index 837b1da78d3..5a513d3e7a4 100755 --- a/mozilla/browser/components/feeds/src/FeedWriter.js +++ b/mozilla/browser/components/feeds/src/FeedWriter.js @@ -715,7 +715,7 @@ FeedWriter.prototype = { // For privacy reasons we cannot set the image attribute directly // to the icon url, see Bug 358878 var uri = makeURI(handlers[i].uri); - if (uri) + if (uri && /^https?/.test(uri.scheme)) new iconDataURIGenerator(uri.prePath + "/favicon.ico", menuItem) } } diff --git a/mozilla/browser/components/preferences/feeds.js b/mozilla/browser/components/preferences/feeds.js index a95761a7809..53ec47b80e7 100644 --- a/mozilla/browser/components/preferences/feeds.js +++ b/mozilla/browser/components/preferences/feeds.js @@ -187,8 +187,9 @@ var gFeedsPane = { row.setAttribute("webhandlerurl", handlers[i].uri); var uri = ios.newURI(handlers[i].uri, null, null); - row.setAttribute("image", uri.prePath + "/favicon.ico"); - + if (/^https?/.test(uri.scheme)) + row.setAttribute("image", uri.prePath + "/favicon.ico"); + readersList.appendChild(row); } },