diff options
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/components/downloads/ApplicationReputation.cpp | 2 | ||||
| -rwxr-xr-x | toolkit/mozapps/installer/windows/nsis/common.nsh | 15 |
2 files changed, 1 insertions, 16 deletions
diff --git a/toolkit/components/downloads/ApplicationReputation.cpp b/toolkit/components/downloads/ApplicationReputation.cpp index 9fdc8a103..6adefbb8b 100644 --- a/toolkit/components/downloads/ApplicationReputation.cpp +++ b/toolkit/components/downloads/ApplicationReputation.cpp @@ -467,7 +467,7 @@ static const char16_t* kBinaryFileExtensions[] = { u".isp", // IIS config //u".isu", // InstallShield u".jar", // Java - u".jnlp", // Java + //u".jnlp", // Java //u".job", // Windows u".js", // JavaScript script u".jse", // JScript diff --git a/toolkit/mozapps/installer/windows/nsis/common.nsh b/toolkit/mozapps/installer/windows/nsis/common.nsh index 846718dab..36e228797 100755 --- a/toolkit/mozapps/installer/windows/nsis/common.nsh +++ b/toolkit/mozapps/installer/windows/nsis/common.nsh @@ -5218,21 +5218,6 @@ StrCpy $AddStartMenuSC "1" ${EndIf} - ReadINIStr $R8 $R7 "Install" "TaskbarShortcut" - ${If} $R8 == "false" - StrCpy $AddTaskbarSC "0" - ${Else} - StrCpy $AddTaskbarSC "1" - ${EndIf} - - ReadINIStr $R8 $R7 "Install" "MaintenanceService" - ${If} $R8 == "false" - StrCpy $InstallMaintenanceService "0" - ${Else} - ; Installing the service always requires elevation. - ${ElevateUAC} - ${EndIf} - !ifndef NO_STARTMENU_DIR ReadINIStr $R8 $R7 "Install" "StartMenuDirectoryName" ${If} $R8 != "" |