From dcff0bdcb27f87a6b3b174e87558bdeb1be7d318 Mon Sep 17 00:00:00 2001 From: "myk%mozilla.org" Date: Wed, 6 Apr 2005 20:13:32 +0000 Subject: [PATCH] Second fix for bug 271473: whitelists addons.mozilla.org not only for new profiles but for existing profiles too, unblocking server-side architectural improvements that are waiting for a version of Firefox which can install extensions from addons.mozilla.org; r=bsmedberg --- browser/app/profile/firefox.js | 3 ++- mail/app/profile/all-thunderbird.js | 3 ++- xpinstall/public/nsISoftwareUpdate.h | 1 + xpinstall/src/nsInstallTrigger.cpp | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 60de448eabec..7ac5d57c2659 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -121,7 +121,8 @@ pref("update.showSlidingNotification", true); // Windows-only slide-up taskbar // 2 = high (new version of Firefox/Security patch) pref("update.severity", 0); -pref("xpinstall.whitelist.add", "update.mozilla.org,addons.mozilla.org"); +pref("xpinstall.whitelist.add", "update.mozilla.org"); +pref("xpinstall.whitelist.add.103", "addons.mozilla.org"); pref("keyword.enabled", true); pref("keyword.URL", "http://www.google.com/search?btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8&q="); diff --git a/mail/app/profile/all-thunderbird.js b/mail/app/profile/all-thunderbird.js index c87a8d577481..59ab6670966d 100644 --- a/mail/app/profile/all-thunderbird.js +++ b/mail/app/profile/all-thunderbird.js @@ -106,7 +106,8 @@ pref("update.showSlidingNotification", true); // Windows-only slide-up taskbar // 2 = high (new version of Firefox/Security patch) pref("update.severity", 0); -pref("xpinstall.whitelist.add", "update.mozilla.org,addons.mozilla.org"); +pref("xpinstall.whitelist.add", "update.mozilla.org"); +pref("xpinstall.whitelist.add.103", "addons.mozilla.org"); pref("mail.phishing.detection.enabled", true); // enable / disable phishing detection for link clicks pref("mail.spellcheck.inline", true); diff --git a/xpinstall/public/nsISoftwareUpdate.h b/xpinstall/public/nsISoftwareUpdate.h index 8899508fe1a2..9e7484b75b75 100644 --- a/xpinstall/public/nsISoftwareUpdate.h +++ b/xpinstall/public/nsISoftwareUpdate.h @@ -57,6 +57,7 @@ #define XPINSTALL_ENABLE_PREF "xpinstall.enabled" #define XPINSTALL_WHITELIST_ADD "xpinstall.whitelist.add" +#define XPINSTALL_WHITELIST_ADD_103 "xpinstall.whitelist.add.103" #define XPINSTALL_WHITELIST_REQUIRED "xpinstall.whitelist.required" #define XPINSTALL_BLACKLIST_ADD "xpinstall.blacklist.add" diff --git a/xpinstall/src/nsInstallTrigger.cpp b/xpinstall/src/nsInstallTrigger.cpp index fd7b7b5f10eb..76cb78fa02b7 100644 --- a/xpinstall/src/nsInstallTrigger.cpp +++ b/xpinstall/src/nsInstallTrigger.cpp @@ -349,6 +349,9 @@ nsInstallTrigger::AllowInstall(nsIURI* aLaunchURI) updatePermissions( XPINSTALL_WHITELIST_ADD, nsIPermissionManager::ALLOW_ACTION, permissionMgr, prefBranch ); + updatePermissions( XPINSTALL_WHITELIST_ADD_103, + nsIPermissionManager::ALLOW_ACTION, + permissionMgr, prefBranch ); updatePermissions( XPINSTALL_BLACKLIST_ADD, nsIPermissionManager::DENY_ACTION, permissionMgr, prefBranch );