Bug 1726808 - Un-hardcode the snap name to check against in nsToolkit…

…ProfileService::IsSnapEnvironment(). r=stransky,mossop Differential Revision: https://phabricator.services.mozilla.com/D123239
dothq · Aug 27, 2021 · 27a83cc · 27a83cc
1 parent 6008d35
commit 27a83cc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/toolkit/profile/moz.build b/toolkit/profile/moz.build
@@ -36,6 +36,8 @@ LOCAL_INCLUDES += [
 
 FINAL_LIBRARY = "xul"
 
+DEFINES["MOZ_APP_NAME"] = '"%s"' % CONFIG["MOZ_APP_NAME"]
+
 JAR_MANIFESTS += ["jar.mn"]
 
 with Files("**"):

diff --git a/toolkit/profile/nsToolkitProfileService.cpp b/toolkit/profile/nsToolkitProfileService.cpp
@@ -2053,8 +2053,9 @@ bool nsToolkitProfileService::IsSnapEnvironment() {
     return false;
   }
 
-  // snapName as defined on https://snapcraft.io/firefox
-  return (strcmp(snapName, "firefox") == 0);
+  // snapName as defined on e.g.
+  // https://snapcraft.io/firefox or https://snapcraft.io/thunderbird
+  return (strcmp(snapName, MOZ_APP_NAME) == 0);
 }
 
 /**