diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-05 12:41:16 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-05 12:41:16 +0100 |
| commit | 2d652d1c355c8bdde03a6c278b5b7b444424e394 (patch) | |
| tree | 0ea18eabc7d3cdec78e59701e10e15a662af6641 /browser/app | |
| parent | 2782832f265a8e0a7923ca885b431907cde7cc49 (diff) | |
| parent | e8417003899a4ec9274815be30352c1328fc32e9 (diff) | |
| download | UXP-2d652d1c355c8bdde03a6c278b5b7b444424e394.tar UXP-2d652d1c355c8bdde03a6c278b5b7b444424e394.tar.gz UXP-2d652d1c355c8bdde03a6c278b5b7b444424e394.tar.lz UXP-2d652d1c355c8bdde03a6c278b5b7b444424e394.tar.xz UXP-2d652d1c355c8bdde03a6c278b5b7b444424e394.zip | |
Merge branch 'master' into ported-upstream
Diffstat (limited to 'browser/app')
| -rw-r--r-- | browser/app/Makefile.in | 2 | ||||
| -rw-r--r-- | browser/app/basilisk.exe.manifest (renamed from browser/app/firefox.exe.manifest) | 2 | ||||
| -rw-r--r-- | browser/app/module.ver | 6 | ||||
| -rw-r--r-- | browser/app/nsBrowserApp.cpp | 6 | ||||
| -rw-r--r-- | browser/app/splash.rc | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in index cbd2ec0fc..d807b4337 100644 --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -28,7 +28,7 @@ ifeq ($(OS_ARCH),WINNT) # (this dependency should really be just for firefox.exe, not other targets) # Note the manifest file exists in the tree, so we use the explicit filename # here. -EXTRA_DEPS += firefox.exe.manifest +EXTRA_DEPS += basilisk.exe.manifest endif PROGRAMS_DEST = $(DIST)/bin diff --git a/browser/app/firefox.exe.manifest b/browser/app/basilisk.exe.manifest index 8b8db4b7b..079e15b58 100644 --- a/browser/app/firefox.exe.manifest +++ b/browser/app/basilisk.exe.manifest @@ -3,7 +3,7 @@ <assemblyIdentity version="1.0.0.0" processorArchitecture="*" - name="Firefox" + name="Basilisk" type="win32" /> <description>Firefox</description> diff --git a/browser/app/module.ver b/browser/app/module.ver index 5ef8d2a02..0373ff96d 100644 --- a/browser/app/module.ver +++ b/browser/app/module.ver @@ -1,8 +1,8 @@ -WIN32_MODULE_COMPANYNAME=Mozilla Corporation -WIN32_MODULE_COPYRIGHT=©Firefox and Mozilla Developers; available under the MPL 2 license. +WIN32_MODULE_COMPANYNAME=Moonchild Productions +WIN32_MODULE_COPYRIGHT=©Basilisk and Mozilla Developers; available under the MPL 2 license. WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@ WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@ -WIN32_MODULE_TRADEMARKS=Firefox is a Trademark of The Mozilla Foundation. +WIN32_MODULE_TRADEMARKS=Basilisk is a Trademark of Moonchild Productions. WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@ WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@ WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@ diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp index 981e2f14c..ac2e85ea3 100644 --- a/browser/app/nsBrowserApp.cpp +++ b/browser/app/nsBrowserApp.cpp @@ -25,7 +25,7 @@ #ifdef XP_WIN #ifdef MOZ_ASAN -// ASAN requires firefox.exe to be built with -MD, and it's OK if we don't +// ASAN requires basilisk.exe to be built with -MD, and it's OK if we don't // support Windows XP SP2 in ASAN builds. #define XRE_DONT_SUPPORT_XPSP2 #endif @@ -84,7 +84,7 @@ static void Output(const char *fmt, ... ) decltype(MessageBoxW)* messageBoxW = (decltype(MessageBoxW)*) GetProcAddress(user32, "MessageBoxW"); if (messageBoxW) { - messageBoxW(nullptr, wide_msg, L"Firefox", MB_OK + messageBoxW(nullptr, wide_msg, L"Basilisk", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); } @@ -170,7 +170,7 @@ static int do_main(int argc, char* argv[], char* envp[], nsIFile *xreDirectory) nsresult rv; uint32_t mainFlags = 0; - // Allow firefox.exe to launch XULRunner apps via -app <application.ini> + // Allow basilisk.exe to launch XULRunner apps via -app <application.ini> // Note that -app must be the *first* argument. const char *appDataFile = getenv("XUL_APP_FILE"); if (appDataFile && *appDataFile) { diff --git a/browser/app/splash.rc b/browser/app/splash.rc index c406b7985..beccf8706 100644 --- a/browser/app/splash.rc +++ b/browser/app/splash.rc @@ -6,7 +6,7 @@ #include <windows.h> #include "nsNativeAppSupportWin.h" -1 24 "firefox.exe.manifest" +1 24 "basilisk.exe.manifest" IDI_APPICON ICON FIREFOX_ICO IDI_DOCUMENT ICON DOCUMENT_ICO |