From 5e83a5b06377d1ccc38c01c074b5de62051e8ae2 Mon Sep 17 00:00:00 2001 From: asac Date: Sat, 24 Feb 2007 21:21:21 +0100 Subject: [PATCH] bz343360-feed-flat-chrome-fix + browser/components/feeds/src/FeedWriter.js: apply fix from bugzilla bug #343360; FileWriter's security check doesn't work with flat chrome --- browser/components/feeds/src/FeedWriter.js | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/browser/components/feeds/src/FeedWriter.js b/browser/components/feeds/src/FeedWriter.js index a48ddc2..80ef93f 100755 --- a/browser/components/feeds/src/FeedWriter.js +++ b/browser/components/feeds/src/FeedWriter.js @@ -795,8 +795,15 @@ FeedWriter.prototype = { getInterface(Ci.nsIWebNavigation). QueryInterface(Ci.nsIDocShell_MOZILLA_1_8_BRANCH). currentDocumentChannel; - const kPrefix = "jar:file:"; - if (chan.URI.spec.substring(0, kPrefix.length) == kPrefix) + const SUBSCRIBE_PAGE_URI = "chrome://browser/content/feeds/subscribe.xhtml"; + var uri = Cc["@mozilla.org/network/io-service;1"]. + getService(Ci.nsIIOService). + newURI(SUBSCRIBE_PAGE_URI, "", null); + var resolvedURI = Cc["@mozilla.org/chrome/chrome-registry;1"]. + getService(Ci.nsIChromeRegistry). + convertChromeURL(uri); + + if (resolvedURI.equals(chan.URI)) return chan.originalURI; else return null; -- 1.4.4.4