From 2e63d37d5c67acf638985f9f15d6608361de66e6 Mon Sep 17 00:00:00 2001 From: Gaming4JC Date: Sat, 20 Jul 2019 22:48:03 -0400 Subject: [PATCH 04/12] Hardcode AppName in nsAppRunner Patches WM_ClassName and Application Name since we are keeping them unchanged for folder compatibility reasons. Additional branding improvements of Help and Version String changes courtesy HarvettFox96. --- toolkit/xre/nsAppRunner.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index ad5ba1017..1a516eecc 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -1331,11 +1331,11 @@ DumpHelp() #endif #ifdef XP_UNIX printf(" --g-fatal-warnings Make all warnings fatal.\n" - "\n%s options\n", gAppData->name); + "\nIceweasel-UXP options\n", gAppData->name); #endif printf(" -h or --help Print this message.\n" - " -v or --version Print %s version.\n" + " -v or --version Print Iceweasel-UXP version.\n" " -P Start with .\n" " --profile Start with profile at .\n" #ifdef MC_BASILISK @@ -1404,9 +1404,7 @@ static int MSCRTReportHook( int aReportType, char *aMessage, int *oReturnValue) static inline void DumpVersion() { - if (gAppData->vendor) - printf("%s ", gAppData->vendor); - printf("%s %s", gAppData->name, gAppData->version); + printf("Hyperbola Iceweasel-UXP %s", gAppData->version); if (gAppData->copyright) printf(", %s", gAppData->copyright); printf("\n"); @@ -3195,11 +3193,9 @@ XREMain::XRE_mainStartup(bool* aExitFlag) gdk_rgb_set_install(TRUE); #endif - // Set program name to the one defined in application.ini. + // Set WM_CLASS name { - nsAutoCString program(gAppData->name); - ToLowerCase(program); - g_set_prgname(program.get()); + g_set_prgname("Iceweasel-UXP"); } // Initialize GTK here for splash. -- 2.25.2