Pier Angelo Vendrame pushed to branch tor-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser
Commits:
- 
d4310b2a
by Pier Angelo Vendrame at 2024-03-06T19:22:00+01:00
- 
12e3f725
by Pier Angelo Vendrame at 2024-03-06T19:22:09+01:00
2 changed files:
Changes:
| ... | ... | @@ -631,11 +631,6 @@ pref("privacy.query_stripping.strip_on_share.enabled", true); | 
| 631 | 631 |  pref("dom.text-recognition.enabled", false);
 | 
| 632 | 632 | |
| 633 | 633 |  #ifdef XP_WIN
 | 
| 634 | -// prefs to disable jump-list entries in the taskbar on Windows (see bug #12885)
 | |
| 635 | -// this pref changes the app's set AUMID to be dependent on the profile path, rather than
 | |
| 636 | -// attempting to read it from the registry; this is necessary so that the file generated
 | |
| 637 | -// by the jumplist system can be properly deleted if it is disabled
 | |
| 638 | -pref("taskbar.grouping.useprofile", true);
 | |
| 639 | 634 |  pref("browser.taskbar.lists.enabled", false);
 | 
| 640 | 635 |  pref("browser.taskbar.lists.frequent.enabled", false);
 | 
| 641 | 636 |  pref("browser.taskbar.lists.tasks.enabled", false);
 | 
| ... | ... | @@ -209,6 +209,19 @@ bool WinTaskbar::GenerateAppUserModelID(nsAString& aAppUserModelId, | 
| 209 | 209 |    // If marked as such in prefs, use a hash of the profile path for the id
 | 
| 210 | 210 |    // instead of the install path hash setup by the installer.
 | 
| 211 | 211 |    bool useProfile = Preferences::GetBool("taskbar.grouping.useprofile", false);
 | 
| 212 | + | |
| 213 | +  {
 | |
| 214 | +    // For portable mode, force the AUMID to be based on the profile directory
 | |
| 215 | +    // instead of reading it from the registry.
 | |
| 216 | +    bool isPortable = true;
 | |
| 217 | +    // Do not even check if taskbar.grouping.useprofile is already true.
 | |
| 218 | +    if (!useProfile &&
 | |
| 219 | +        NS_SUCCEEDED(gDirServiceProvider->GetIsPortableMode(&isPortable)) &&
 | |
| 220 | +        isPortable) {
 | |
| 221 | +      useProfile = true;
 | |
| 222 | +    }
 | |
| 223 | +  }
 | |
| 224 | + | |
| 212 | 225 |    if (useProfile) {
 | 
| 213 | 226 |      nsCOMPtr<nsIFile> profileDir;
 | 
| 214 | 227 |      NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,
 |