From 2c6ac8059a2a53059dbb0456e46773635df9275c Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Fri, 28 Jan 2022 10:30:37 +0000 Subject: [PATCH] Bug 1530052 - Use remoting name for GDK program name and class. r=glandium Differential Revision: https://phabricator.services.mozilla.com/D80371 --- toolkit/xre/nsAppRunner.cpp | 6 +----- widget/gtk/nsAppShell.cpp | 12 +++++------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index f3210cdbe9c8..262004474775 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -4370,11 +4370,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) { // consistently. // Set program name to the one defined in application.ini. - { - nsAutoCString program(gAppData->name); - ToLowerCase(program); - g_set_prgname(program.get()); - } + g_set_prgname(gAppData->remotingName); // Initialize GTK here for splash. diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp index c8bbd9a373f5..a6a2186f20fb 100644 --- a/widget/gtk/nsAppShell.cpp +++ b/widget/gtk/nsAppShell.cpp @@ -27,6 +27,8 @@ # include "nsIObserverService.h" #endif #include "gfxPlatform.h" +#include "nsAppRunner.h" +#include "mozilla/XREAppData.h" #include "ScreenHelperGTK.h" #include "HeadlessScreenHelper.h" #include "mozilla/widget/ScreenManager.h" @@ -257,13 +259,9 @@ nsresult nsAppShell::Init() { // See https://bugzilla.gnome.org/show_bug.cgi?id=747634 // // Only bother doing this for the parent process, since it's the one - // creating top-level windows. (At this point, a child process hasn't - // received the list of registered chrome packages, so the - // GetBrandShortName call would fail anyway.) - nsAutoString brandName; - mozilla::widget::WidgetUtils::GetBrandShortName(brandName); - if (!brandName.IsEmpty()) { - gdk_set_program_class(NS_ConvertUTF16toUTF8(brandName).get()); + // creating top-level windows. + if (gAppData) { + gdk_set_program_class(gAppData->remotingName); } } }