From 9de464ed516e1ff2995eb5270d942048e832ae1d Mon Sep 17 00:00:00 2001 From: Gaming4JC Date: Sun, 24 May 2020 00:15:03 -0400 Subject: [PATCH 02/12] Add iceweasel-uxp application specfic override --- docshell/base/nsAboutRedirector.cpp | 5 ++--- toolkit/xre/nsAppRunner.cpp | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp index e1d883532..12a767a78 100644 --- a/docshell/base/nsAboutRedirector.cpp +++ b/docshell/base/nsAboutRedirector.cpp @@ -53,9 +53,8 @@ static RedirEntry kRedirMap[] = { { "config", "chrome://global/content/config.xul", 0 }, { "console", "chrome://global/content/console.xul", 0 }, { - "credits", "http://www.palemoon.org/Contributors.shtml", - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::MAKE_LINKABLE + "credits", "chrome://global/content/aboutCredits.html", + nsIAboutModule::MAKE_LINKABLE }, #ifdef MOZ_DEVTOOLS { diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 55072c474..ad5ba1017 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -3695,8 +3695,8 @@ XREMain::XRE_mainRun() // reset the profile. // For Basilisk and Pale Moon: // Hard-code MOZ_APP_NAME to firefox because of hard-coded type in migrator. - aKey = (((MOZ_APP_NAME == "basilisk") - || (MOZ_APP_NAME == "palemoon")) + aKey = (((MOZ_APP_NAME == "iceweasel-uxp") + || (MOZ_APP_NAME == "iceweasel-classic")) ? "firefox" : MOZ_APP_NAME); } -- 2.25.2