| 
Commits:
eff20896
 by Pier Angelo Vendrame   at 2023-03-22T15:40:02+01:00 
 fixup! Firefox preference overrides.
Bug 41689: Do not customize startup.homepage_override_url in Base
Browser.
2af5abfc
 by Pier Angelo Vendrame   at 2023-03-22T15:42:49+01:00 
 fixup! Bug 2176: Rebrand Firefox to TorBrowser
Bug 41689: Move the generic updated URL to the right place
 
4 changed files:
Changes:
browser/app/profile/001-base-profile.js
 
| ... | ... | @@ -17,13 +17,6 @@ pref("startup.homepage_welcome_url.additional", ""); |  
| 17 | 17 |  // Disable Firefox Welcome Dialog
 |  
| 18 | 18 |  pref("browser.aboutwelcome.enabled", false);
 |  
| 19 | 19 |  
 |  
| 20 |  | -// Set a generic, default URL that will be opened in a tab after an update.
 |  
| 21 |  | -// Typically, this will not be used; instead, the <update> element within
 |  
| 22 |  | -// each update manifest should contain attributes similar to:
 |  
| 23 |  | -//   actions="showURL"
 |  
| 24 |  | -//   openURL="https://blog.torproject.org/tor-browser-55a2-released"
 |  
| 25 |  | -pref("startup.homepage_override_url", "https://blog.torproject.org/category/applications");
 |  
| 26 |  | -
 |  
| 27 | 20 |  // Bug 41668: allow users to apply updates. This is set also in firefox.js for
 |  
| 28 | 21 |  // all platforms, except for Windows. As explained on firefox.js, Firefox uses a
 |  
| 29 | 22 |  // per-installation preference on Windows. However, we patch this behavior, and
 |  browser/branding/tb-alpha/pref/firefox-branding.js
 
 
| ... | ... | @@ -4,11 +4,16 @@ |  
| 4 | 4 |  
 |  
| 5 | 5 |  // This file contains branding-specific prefs.
 |  
| 6 | 6 |  
 |  
| 7 |  | -pref("startup.homepage_override_url", "https://www.mozilla.org/projects/firefox/%VERSION%/whatsnew/?oldversion=%OLD_VERSION%");
 |  
| 8 |  | -pref("startup.homepage_welcome_url", "https://www.mozilla.org/projects/firefox/%VERSION%/firstrun/");
 |  
|  | 7 | +// Set a generic, default URL that will be opened in a tab after an update.
 |  
|  | 8 | +// Typically, this will not be used; instead, the <update> element within
 |  
|  | 9 | +// each update manifest should contain attributes similar to:
 |  
|  | 10 | +//   actions="showURL"
 |  
|  | 11 | +//   openURL="https://blog.torproject.org/tor-browser-55a2-released"
 |  
|  | 12 | +pref("startup.homepage_override_url", "https://blog.torproject.org/category/applications");
 |  
|  | 13 | +pref("startup.homepage_welcome_url", "about:welcome");
 |  
| 9 | 14 |  pref("startup.homepage_welcome_url.additional", "");
 |  
| 10 | 15 |  // The time interval between checks for a new version (in seconds)
 |  
| 11 |  | -pref("app.update.interval", 7200); // 2 hours
 |  
|  | 16 | +pref("app.update.interval", 43200); // 12 hours
 |  
| 12 | 17 |  // Give the user x seconds to react before showing the big UI. default=12 hours
 |  
| 13 | 18 |  pref("app.update.promptWaitTime", 43200);
 |  
| 14 | 19 |  // URL user can browse to manually if for some reason all update installation
 |  browser/branding/tb-nightly/pref/firefox-branding.js
 
 
| ... | ... | @@ -4,11 +4,16 @@ |  
| 4 | 4 |  
 |  
| 5 | 5 |  // This file contains branding-specific prefs.
 |  
| 6 | 6 |  
 |  
| 7 |  | -pref("startup.homepage_override_url", "https://www.mozilla.org/projects/firefox/%VERSION%/whatsnew/?oldversion=%OLD_VERSION%");
 |  
| 8 |  | -pref("startup.homepage_welcome_url", "https://www.mozilla.org/projects/firefox/%VERSION%/firstrun/");
 |  
|  | 7 | +// Set a generic, default URL that will be opened in a tab after an update.
 |  
|  | 8 | +// Typically, this will not be used; instead, the <update> element within
 |  
|  | 9 | +// each update manifest should contain attributes similar to:
 |  
|  | 10 | +//   actions="showURL"
 |  
|  | 11 | +//   openURL="https://blog.torproject.org/tor-browser-55a2-released"
 |  
|  | 12 | +pref("startup.homepage_override_url", "https://blog.torproject.org/category/applications");
 |  
|  | 13 | +pref("startup.homepage_welcome_url", "about:welcome");
 |  
| 9 | 14 |  pref("startup.homepage_welcome_url.additional", "");
 |  
| 10 | 15 |  // The time interval between checks for a new version (in seconds)
 |  
| 11 |  | -pref("app.update.interval", 7200); // 2 hours
 |  
|  | 16 | +pref("app.update.interval", 14400); // 4 hours
 |  
| 12 | 17 |  // Give the user x seconds to react before showing the big UI. default=12 hours
 |  
| 13 | 18 |  pref("app.update.promptWaitTime", 43200);
 |  
| 14 | 19 |  // URL user can browse to manually if for some reason all update installation
 |  browser/branding/tb-release/pref/firefox-branding.js
 
 
| ... | ... | @@ -4,7 +4,12 @@ |  
| 4 | 4 |  
 |  
| 5 | 5 |  // This file contains branding-specific prefs.
 |  
| 6 | 6 |  
 |  
| 7 |  | -pref("startup.homepage_override_url", "");
 |  
|  | 7 | +// Set a generic, default URL that will be opened in a tab after an update.
 |  
|  | 8 | +// Typically, this will not be used; instead, the <update> element within
 |  
|  | 9 | +// each update manifest should contain attributes similar to:
 |  
|  | 10 | +//   actions="showURL"
 |  
|  | 11 | +//   openURL="https://blog.torproject.org/tor-browser-55a2-released"
 |  
|  | 12 | +pref("startup.homepage_override_url", "https://blog.torproject.org/category/applications");
 |  
| 8 | 13 |  pref("startup.homepage_welcome_url", "about:welcome");
 |  
| 9 | 14 |  pref("startup.homepage_welcome_url.additional", "");
 |  
| 10 | 15 |  // Interval: Time between checks for a new version (in seconds)
 |  
 |