wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-03 05:47:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Add HYPE_ICEWEASEL where appropriate

Browse source
This commit is contained in:
NTD 2018-06-28 15:50:23 -04:00 • committed by Roy Tam
commit 50f4bff9a5
4 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
toolkit/components/passwordmgr/content/passwordManager.js
View file

@ -727,10 +727,12 @@ function escapeKeyHandler() {
window.close(); window.close();
} }
#if defined(MC_BASILISK) && defined(XP_WIN) #ifdef XP_WIN
#if defined(MC_BASILISK) || defined(HYPE_ICEWEASEL)
function OpenMigrator() { function OpenMigrator() {
const { MigrationUtils } = Cu.import("resource:///modules/MigrationUtils.jsm", {}); const { MigrationUtils } = Cu.import("resource:///modules/MigrationUtils.jsm", {});
// We pass in the type of source we're using for use in telemetry: // We pass in the type of source we're using for use in telemetry:
MigrationUtils.showMigrationWizard(window, [MigrationUtils.MIGRATION_ENTRYPOINT_PASSWORDS]); MigrationUtils.showMigrationWizard(window, [MigrationUtils.MIGRATION_ENTRYPOINT_PASSWORDS]);
} }
#endif #endif
#endif

4
toolkit/components/passwordmgr/content/passwordManager.xul
View file

@ -112,10 +112,12 @@
<button id="removeAllSignons" icon="clear" <button id="removeAllSignons" icon="clear"
oncommand="DeleteAllSignons();"/> oncommand="DeleteAllSignons();"/>
<spacer flex="1"/> <spacer flex="1"/>
#if defined(MC_BASILISK) && defined(XP_WIN) #ifdef XP_WIN
#if defined(MC_BASILISK) || defined(HYPE_ICEWEASEL)
<button accesskey="&import.accesskey;" <button accesskey="&import.accesskey;"
label="&import.label;" label="&import.label;"
oncommand="OpenMigrator();"/> oncommand="OpenMigrator();"/>
#endif
#endif #endif
<button id="togglePasswords" <button id="togglePasswords"
oncommand="TogglePasswordVisible();"/> oncommand="TogglePasswordVisible();"/>

2
toolkit/modules/NewTabUtils.jsm
View file

@ -249,7 +249,7 @@ var AllPages = {
* Returns whether the history tiles are enhanced. * Returns whether the history tiles are enhanced.
*/ */
get enhanced() { get enhanced() {
#ifdef MC_BASILISK #if defined(MC_BASILISK) || defined(HYPE_ICEWEASEL)
// Hard-block the use of sponsored tiles. // Hard-block the use of sponsored tiles.
return false; return false;
#else #else

12
toolkit/mozapps/installer/package-name.mk
View file

@ -12,10 +12,18 @@ ifndef PACKAGE_NAME_MK_INCLUDED
PACKAGE_NAME_MK_INCLUDED := 1 PACKAGE_NAME_MK_INCLUDED := 1
ifndef MOZ_PKG_VERSION 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 ifdef MC_BASILISK
MOZ_PKG_VERSION = $(BUILDID) MOZ_PKG_VERSION = $(BUILDID)
else endif
MOZ_PKG_VERSION = $(MOZ_APP_VERSION)
ifdef HYPE_ICEWEASEL
MOZ_PKG_VERSION = $(BUILDID)
endif endif
endif endif