Bug 1444313 - Fix desktop file name for snapd's xdg-setting wrapper.
MozReview-Commit-ID: KfG8oEYArKm
--- a/browser/components/shell/nsGNOMEShellService.cpp
+++ b/browser/components/shell/nsGNOMEShellService.cpp
@@ -210,17 +210,17 @@ NS_IMETHODIMP
nsGNOMEShellService::IsDefaultBrowser(bool aStartupCheck,
bool aForAllTypes,
bool* aIsDefaultBrowser)
{
*aIsDefaultBrowser = false;
if (IsRunningAsASnap()) {
const gchar *argv[] = { "xdg-settings", "check", "default-web-browser",
- "firefox_firefox.desktop", nullptr };
+ "firefox.desktop", nullptr };
GSpawnFlags flags = static_cast<GSpawnFlags>(G_SPAWN_SEARCH_PATH |
G_SPAWN_STDERR_TO_DEV_NULL);
gchar *output = nullptr;
gint exit_status = 0;
if (!g_spawn_sync(nullptr, (gchar **) argv, nullptr, flags, nullptr,
nullptr, &output, nullptr, &exit_status, nullptr)) {
return NS_OK;
}
@@ -282,17 +282,17 @@ nsGNOMEShellService::SetDefaultBrowser(b
{
#ifdef DEBUG
if (aForAllUsers)
NS_WARNING("Setting the default browser for all users is not yet supported");
#endif
if (IsRunningAsASnap()) {
const gchar *argv[] = { "xdg-settings", "set", "default-web-browser",
- "firefox_firefox.desktop", nullptr };
+ "firefox.desktop", nullptr };
GSpawnFlags flags = static_cast<GSpawnFlags>(G_SPAWN_SEARCH_PATH |
G_SPAWN_STDOUT_TO_DEV_NULL |
G_SPAWN_STDERR_TO_DEV_NULL);
g_spawn_sync(nullptr, (gchar **) argv, nullptr, flags, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr);
return NS_OK;
}