From 52c0fd1e9404145ef81c9e18b1dc3ce9aa75539b Mon Sep 17 00:00:00 2001
From: Paolo Amadini <paolo.mozmail@amadzone.org>
Date: Fri, 27 Apr 2012 15:05:34 +0200
Subject: [PATCH] Bug 728168 - Replace old synchronous favicons calls in feeds.
 r=mak

---
 browser/components/feeds/src/FeedWriter.js          | 2 +-
 browser/components/feeds/src/WebContentConverter.js | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/browser/components/feeds/src/FeedWriter.js b/browser/components/feeds/src/FeedWriter.js
index 6c1f3ad1fe1..76848ca9689 100644
--- a/browser/components/feeds/src/FeedWriter.js
+++ b/browser/components/feeds/src/FeedWriter.js
@@ -1366,7 +1366,7 @@ FeedWriter.prototype = {
     }
     var faviconURI = makeURI(readerURI.prePath + "/favicon.ico");
     var self = this;
-    this._faviconService.setAndLoadFaviconForPage(readerURI, faviconURI, false,
+    this._faviconService.setAndFetchFaviconForPage(readerURI, faviconURI, false,
       function (aURI, aDataLen, aData, aMimeType) {
         if (aDataLen > 0) {
           var dataURL = "data:" + aMimeType + ";base64," +
diff --git a/browser/components/feeds/src/WebContentConverter.js b/browser/components/feeds/src/WebContentConverter.js
index 837dca29636..2af877dc09e 100644
--- a/browser/components/feeds/src/WebContentConverter.js
+++ b/browser/components/feeds/src/WebContentConverter.js
@@ -448,9 +448,8 @@ WebContentConverterRegistrar.prototype = {
       // Now Ask the user and provide the proper callback
       message = this._getFormattedString("addProtocolHandler",
                                          [aTitle, uri.host, aProtocol]);
-      var fis = Cc["@mozilla.org/browser/favicon-service;1"].
-                getService(Ci.nsIFaviconService);
-      var notificationIcon = fis.getFaviconLinkForIcon(uri);
+
+      var notificationIcon = uri.prePath + "/favicon.ico";
       var notificationValue = "Protocol Registration: " + aProtocol;
       var addButton = {
         label: this._getString("addProtocolHandlerAddButton"),