Bug 1922961 - Don't append the browser subdirectory in Thunderbird. r…

…=win-reviewers,handyman, a=dmeehan
goastian · Nov 5, 2024 · 4e27152 · 4e27152
1 parent 0661479
commit 4e27152
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/widget/windows/ToastNotification.cpp b/widget/windows/ToastNotification.cpp
@@ -180,8 +180,11 @@ bool ToastNotification::RegisterRuntimeAumid(nsAutoString& aInstallHash,
   rv = appdir->Clone(getter_AddRefs(icon));
   NS_ENSURE_SUCCESS(rv, false);
 
+  // Add  browser subdirectory only for Firefox
+  #ifdef MOZ_BUILD_APP_IS_BROWSER
   rv = icon->Append(u"browser"_ns);
   NS_ENSURE_SUCCESS(rv, false);
+  #endif
 
   rv = icon->Append(u"VisualElements"_ns);
   NS_ENSURE_SUCCESS(rv, false);

diff --git a/widget/windows/moz.build b/widget/windows/moz.build
@@ -185,6 +185,9 @@ LOCAL_INCLUDES += [
     "/xpcom/base",
 ]
 
+if CONFIG["MOZ_BUILD_APP"] == "browser":
+    DEFINES["MOZ_BUILD_APP_IS_BROWSER"] = True
+
 DEFINES["MOZ_UNICODE"] = True
 DEFINES["MOZ_APP_NAME"] = '"%s"' % CONFIG["MOZ_APP_NAME"]
 # Turn `firefox` into `Firefox`.