diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-06-28 15:50:23 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-06-28 15:50:23 -0400 |
| commit | 7664308ab16560fc25622ef68810300233d39fa9 (patch) | |
| tree | b26a7dc3a9490a10ada2f544327196ed887b472e | |
| parent | ddea4710991d889a1c049835442a15fed026de9e (diff) | |
| download | UXP-7664308ab16560fc25622ef68810300233d39fa9.tar UXP-7664308ab16560fc25622ef68810300233d39fa9.tar.gz UXP-7664308ab16560fc25622ef68810300233d39fa9.tar.lz UXP-7664308ab16560fc25622ef68810300233d39fa9.tar.xz UXP-7664308ab16560fc25622ef68810300233d39fa9.zip | |
Add HYPE_ICEWEASEL where appropriate
| -rw-r--r-- | toolkit/components/passwordmgr/content/passwordManager.js | 4 | ||||
| -rw-r--r-- | toolkit/components/passwordmgr/content/passwordManager.xul | 4 | ||||
| -rw-r--r-- | toolkit/modules/NewTabUtils.jsm | 2 | ||||
| -rw-r--r-- | toolkit/mozapps/installer/package-name.mk | 12 |
4 files changed, 17 insertions, 5 deletions
diff --git a/toolkit/components/passwordmgr/content/passwordManager.js b/toolkit/components/passwordmgr/content/passwordManager.js index bd5cebfc4..327ebbdf8 100644 --- a/toolkit/components/passwordmgr/content/passwordManager.js +++ b/toolkit/components/passwordmgr/content/passwordManager.js @@ -727,10 +727,12 @@ function escapeKeyHandler() { window.close(); } -#if defined(MC_BASILISK) && defined(XP_WIN) +#ifdef XP_WIN +#if defined(MC_BASILISK) || defined(HYPE_ICEWEASEL) function OpenMigrator() { const { MigrationUtils } = Cu.import("resource:///modules/MigrationUtils.jsm", {}); // We pass in the type of source we're using for use in telemetry: MigrationUtils.showMigrationWizard(window, [MigrationUtils.MIGRATION_ENTRYPOINT_PASSWORDS]); } #endif +#endif diff --git a/toolkit/components/passwordmgr/content/passwordManager.xul b/toolkit/components/passwordmgr/content/passwordManager.xul index c0a10bf8e..8590d96ac 100644 --- a/toolkit/components/passwordmgr/content/passwordManager.xul +++ b/toolkit/components/passwordmgr/content/passwordManager.xul @@ -112,11 +112,13 @@ <button id="removeAllSignons" icon="clear" oncommand="DeleteAllSignons();"/> <spacer flex="1"/> -#if defined(MC_BASILISK) && defined(XP_WIN) +#ifdef XP_WIN +#if defined(MC_BASILISK) || defined(HYPE_ICEWEASEL) <button accesskey="&import.accesskey;" label="&import.label;" oncommand="OpenMigrator();"/> #endif +#endif <button id="togglePasswords" oncommand="TogglePasswordVisible();"/> </hbox> diff --git a/toolkit/modules/NewTabUtils.jsm b/toolkit/modules/NewTabUtils.jsm index e452a6fb2..548d87dda 100644 --- a/toolkit/modules/NewTabUtils.jsm +++ b/toolkit/modules/NewTabUtils.jsm @@ -249,7 +249,7 @@ var AllPages = { * Returns whether the history tiles are enhanced. */ get enhanced() { -#ifdef MC_BASILISK +#if defined(MC_BASILISK) || defined(HYPE_ICEWEASEL) // Hard-block the use of sponsored tiles. return false; #else diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk index d88975f36..1a8728088 100644 --- a/toolkit/mozapps/installer/package-name.mk +++ b/toolkit/mozapps/installer/package-name.mk @@ -12,10 +12,18 @@ ifndef PACKAGE_NAME_MK_INCLUDED PACKAGE_NAME_MK_INCLUDED := 1 ifndef MOZ_PKG_VERSION +# Normally MOZ_PKG_VERSION is set to the application version +MOZ_PKG_VERSION = $(MOZ_APP_VERSION) + +# This overrides it with the BUILDID for Basilisk and IceWeasel +# We do it this way because makefile's conditional checking is very +# primitive or else very cryptic ifdef MC_BASILISK MOZ_PKG_VERSION = $(BUILDID) -else -MOZ_PKG_VERSION = $(MOZ_APP_VERSION) +endif + +ifdef HYPE_ICEWEASEL +MOZ_PKG_VERSION = $(BUILDID) endif endif |