From c8fa250b707a4dd31f4725c74e040eb12f90c0ca Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Mon, 3 Sep 2018 07:37:40 +0900 Subject: [PATCH] Use remoting name for call to gdk_set_program_class Closes: #907574 Gbp-Pq: Topic debian-hacks Gbp-Pq: Name Use-remoting-name-for-call-to-gdk_set_program_class.patch --- widget/gtk/nsAppShell.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp index 60de473de0..490c79d44b 100644 --- a/widget/gtk/nsAppShell.cpp +++ b/widget/gtk/nsAppShell.cpp @@ -24,9 +24,11 @@ # include "WakeLockListener.h" #endif #include "gfxPlatform.h" +#include "nsAppRunner.h" #include "ScreenHelperGTK.h" #include "HeadlessScreenHelper.h" #include "mozilla/widget/ScreenManager.h" +#include "mozilla/XREAppData.h" #ifdef MOZ_WAYLAND # include "nsWaylandDisplay.h" #endif @@ -155,10 +157,8 @@ nsresult nsAppShell::Init() { // 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()); + if (gAppData) { + gdk_set_program_class(gAppData->remotingName); } } } -- 2.30.2