[tbb-commits] [Git][tpo/applications/tor-browser][base-browser-115.8.0esr-13.5-1] 2 commits: fixup! Firefox preference overrides.

[Pier Angelo Vendrame (@pierov)]

Pier Angelo Vendrame pushed to branch base-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser


Commits:
dc518fc9 by Pier Angelo Vendrame at 2024-03-06T19:21:22+01:00
fixup! Firefox preference overrides.

MB 80: Allow default browser on Windows for Mullvad Browser

- - - - -
afac3196 by Pier Angelo Vendrame at 2024-03-06T19:21:32+01:00
fixup! Bug 9173: Change the default Firefox profile directory to be relative.

Force `GenerateAppUserModelID` to use the profile directory in portable
mode.

- - - - -


2 changed files:

- browser/app/profile/001-base-profile.js
- widget/windows/WinTaskbar.cpp


Changes:

=====================================
browser/app/profile/001-base-profile.js
=====================================
@@ -631,11 +631,6 @@ pref("privacy.query_stripping.strip_on_share.enabled", true);
 pref("dom.text-recognition.enabled", false);
 
 #ifdef XP_WIN
-// prefs to disable jump-list entries in the taskbar on Windows (see bug #12885)
-// this pref changes the app's set AUMID to be dependent on the profile path, rather than
-// attempting to read it from the registry; this is necessary so that the file generated
-// by the jumplist system can be properly deleted if it is disabled
-pref("taskbar.grouping.useprofile", true);
 pref("browser.taskbar.lists.enabled", false);
 pref("browser.taskbar.lists.frequent.enabled", false);
 pref("browser.taskbar.lists.tasks.enabled", false);


=====================================
widget/windows/WinTaskbar.cpp
=====================================
@@ -209,6 +209,19 @@ bool WinTaskbar::GenerateAppUserModelID(nsAString& aAppUserModelId,
   // If marked as such in prefs, use a hash of the profile path for the id
   // instead of the install path hash setup by the installer.
   bool useProfile = Preferences::GetBool("taskbar.grouping.useprofile", false);
+
+  {
+    // For portable mode, force the AUMID to be based on the profile directory
+    // instead of reading it from the registry.
+    bool isPortable = true;
+    // Do not even check if taskbar.grouping.useprofile is already true.
+    if (!useProfile &&
+        NS_SUCCEEDED(gDirServiceProvider->GetIsPortableMode(&isPortable)) &&
+        isPortable) {
+      useProfile = true;
+    }
+  }
+
   if (useProfile) {
     nsCOMPtr<nsIFile> profileDir;
     NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR,



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f3ff4275741c8dad01032cae7633399d9807d5fa...afac3196a52b1d2487f404d06a5b6620ee85ce54

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f3ff4275741c8dad01032cae7633399d9807d5fa...afac3196a52b1d2487f404d06a5b6620ee85ce54
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tbb-commits/attachments/20240306/081daaec/attachment-0001.htm>