summaryrefslogtreecommitdiffstats
path: root/comm/mail/installer/windows/nsis/shared.nsh
diff options
context:
space:
mode:
Diffstat (limited to 'comm/mail/installer/windows/nsis/shared.nsh')
-rwxr-xr-xcomm/mail/installer/windows/nsis/shared.nsh9
1 files changed, 7 insertions, 2 deletions
diff --git a/comm/mail/installer/windows/nsis/shared.nsh b/comm/mail/installer/windows/nsis/shared.nsh
index a1a9645..7c39d62 100755
--- a/comm/mail/installer/windows/nsis/shared.nsh
+++ b/comm/mail/installer/windows/nsis/shared.nsh
@@ -361,7 +361,6 @@
WriteRegStr ${RegKey} "$0" "" "${ClientsRegName}"
WriteRegStr ${RegKey} "$0\DefaultIcon" "" "$8,0"
WriteRegStr ${RegKey} "$0" "DLLPath" "$6"
- WriteRegDWORD ${RegKey} "$0" "SupportUTF8" 0
; The MapiProxy dll can exist in multiple installs of the application.
; Registration occurs as follows with the last action to occur being the one
@@ -597,8 +596,9 @@
${WriteRegStr2} $TmpVal "$0" "GeckoVer" "${GREVersion}" 0
StrCpy $0 "Software\Mozilla\${BrandFullNameInternal}"
- ${WriteRegStr2} $TmpVal "$0" "" "${GREVersion}" 0
+ ${WriteRegStr2} $TmpVal "$0" "" "${AppVersion}" 0
${WriteRegStr2} $TmpVal "$0" "CurrentVersion" "${AppVersion} (${AB_CD})" 0
+ ${WriteRegStr2} $TmpVal "$0" "GeckoVersion" "${GREVersion}" 0
!macroend
!define SetAppKeys "!insertmacro SetAppKeys"
@@ -824,6 +824,11 @@
DeleteRegValue HKLM "$0" "$INSTDIR\${FileMainEXE}"
DeleteRegValue HKCU "$0" "$INSTDIR\${FileMainEXE}"
+ ; Remove the SupportUTF8 registry value as it causes MAPI issues on some locales
+ ; with non-ASCII characters in file names.
+ StrCpy $0 "Software\Clients\Mail\${ClientsRegName}"
+ DeleteRegValue HKLM $0 "SupportUTF8"
+
!macroend
!define RemoveDeprecatedKeys "!insertmacro RemoveDeprecatedKeys"