From 352530c7bb6332f9b2d2cae83b481918301ec00c Mon Sep 17 00:00:00 2001 From: Richard Marti Date: Fri, 6 Oct 2023 16:21:34 +0000 Subject: [PATCH] Bug 1857409 - Port bug 1856100: Remove dead code that handles the removed checkbox from the installer. r=rjl Differential Revision: https://phabricator.services.mozilla.com/D190258 --HG-- extra : moz-landing-system : lando --- mail/installer/windows/nsis/installer.nsi | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/mail/installer/windows/nsis/installer.nsi b/mail/installer/windows/nsis/installer.nsi index 247c92505d..20204d9607 100755 --- a/mail/installer/windows/nsis/installer.nsi +++ b/mail/installer/windows/nsis/installer.nsi @@ -597,28 +597,6 @@ Section "-InstallEndCleanup" DetailPrint "$(STATUS_CLEANUP)" SetDetailsPrint none - ${Unless} ${Silent} - ClearErrors - ${MUI_INSTALLOPTIONS_READ} $0 "summary.ini" "Field 4" "State" - ${If} "$0" == "1" - ${LogHeader} "Setting as the default mail application" - ; AddTaskbarSC is needed by MigrateTaskBarShortcut, which is called by - ; SetAsDefaultAppUserHKCU. If this is called via ExecCodeSegment, - ; MigrateTaskBarShortcut will not see the value of AddTaskbarSC, so we - ; send it via a register instead. - StrCpy $R0 $AddTaskbarSC - ClearErrors - ${GetParameters} $0 - ${GetOptions} "$0" "/UAC:" $0 - ${If} ${Errors} - Call SetAsDefaultMailAppUserHKCU - ${Else} - GetFunctionAddress $0 SetAsDefaultMailAppUserHKCU - UAC::ExecCodeSegment $0 - ${EndIf} - ${EndIf} - ${EndUnless} - ; Adds a pinned Task Bar shortcut (see MigrateTaskBarShortcut for details). ${MigrateTaskBarShortcut} "$AddTaskbarSC"