diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 9491a07a1902..17fc29c57fb3 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -741,26 +741,6 @@ pref("layout.spellcheckDefault", 1); pref("browser.send_pings", false); -/* initial web feed readers list */ -pref("browser.contentHandlers.types.0.title", "chrome://browser-region/locale/region.properties"); -pref("browser.contentHandlers.types.0.uri", "chrome://browser-region/locale/region.properties"); -pref("browser.contentHandlers.types.0.type", "application/vnd.mozilla.maybe.feed"); -pref("browser.contentHandlers.types.1.title", "chrome://browser-region/locale/region.properties"); -pref("browser.contentHandlers.types.1.uri", "chrome://browser-region/locale/region.properties"); -pref("browser.contentHandlers.types.1.type", "application/vnd.mozilla.maybe.feed"); -pref("browser.contentHandlers.types.2.title", "chrome://browser-region/locale/region.properties"); -pref("browser.contentHandlers.types.2.uri", "chrome://browser-region/locale/region.properties"); -pref("browser.contentHandlers.types.2.type", "application/vnd.mozilla.maybe.feed"); -pref("browser.contentHandlers.types.3.title", "chrome://browser-region/locale/region.properties"); -pref("browser.contentHandlers.types.3.uri", "chrome://browser-region/locale/region.properties"); -pref("browser.contentHandlers.types.3.type", "application/vnd.mozilla.maybe.feed"); -pref("browser.contentHandlers.types.4.title", "chrome://browser-region/locale/region.properties"); -pref("browser.contentHandlers.types.4.uri", "chrome://browser-region/locale/region.properties"); -pref("browser.contentHandlers.types.4.type", "application/vnd.mozilla.maybe.feed"); -pref("browser.contentHandlers.types.5.title", "chrome://browser-region/locale/region.properties"); -pref("browser.contentHandlers.types.5.uri", "chrome://browser-region/locale/region.properties"); -pref("browser.contentHandlers.types.5.type", "application/vnd.mozilla.maybe.feed"); - pref("browser.feeds.handler", "ask"); pref("browser.videoFeeds.handler", "ask"); pref("browser.audioFeeds.handler", "ask"); diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js index 239952a7121e..a29b22ff06c2 100644 --- a/browser/components/nsBrowserGlue.js +++ b/browser/components/nsBrowserGlue.js @@ -1811,7 +1811,7 @@ BrowserGlue.prototype = { _migrateUI: function BG__migrateUI() { // Use an increasing number to keep track of the current migration state. // Completely unrelated to the current Firefox release number. - const UI_VERSION = 70; + const UI_VERSION = 71; const BROWSER_DOCURL = AppConstants.BROWSER_CHROME_URL; let currentUIVersion; @@ -2134,6 +2134,14 @@ BrowserGlue.prototype = { Services.prefs.setBoolPref("browser.ctrlTab.migrated", true); } + if (currentUIVersion < 71) { + // Clear legacy saved prefs for content handlers. + let savedContentHandlers = Services.prefs.getChildList("browser.contentHandlers.types"); + for (let savedHandlerPref of savedContentHandlers) { + Services.prefs.clearUserPref(savedHandlerPref); + } + } + // Update the migration version. Services.prefs.setIntPref("browser.migration.version", UI_VERSION); }, diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties index c29dd4284703..57b7bb3b9333 100644 --- a/browser/locales/en-US/chrome/browser-region/region.properties +++ b/browser/locales/en-US/chrome/browser-region/region.properties @@ -2,11 +2,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -# This is the default set of web based feed handlers shown in the reader -# selection UI -browser.contentHandlers.types.0.title=My Yahoo! -browser.contentHandlers.types.0.uri=https://add.my.yahoo.com/rss?url=%s - # increment this number when anything gets changed in the list below. This will # cause Firefox to re-read these prefs and inject any new handlers into the # profile database. Note that "new" is defined as "has a different URL"; this