Mercurial > pidgin.yaz
changeset 15756:2b6acdc5b614
Installer updates
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Fri, 02 Mar 2007 02:00:04 +0000 |
| parents | 5c9980e92674 |
| children | 0d91252f02fb |
| files | pidgin/win32/nsis/pidgin-installer.nsi |
| diffstat | 1 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/win32/nsis/pidgin-installer.nsi Fri Mar 02 01:40:38 2007 +0000 +++ b/pidgin/win32/nsis/pidgin-installer.nsi Fri Mar 02 02:00:04 2007 +0000 @@ -109,8 +109,6 @@ !define MUI_LICENSEPAGE_BUTTON $(PIDGIN_LICENSE_BUTTON) !define MUI_LICENSEPAGE_TEXT_BOTTOM $(PIDGIN_LICENSE_BOTTOM_TEXT) -;TODO: Maybe try to copy the old Gaim installer Lang Reg. key? - !define MUI_LANGDLL_REGISTRY_ROOT "HKCU" !define MUI_LANGDLL_REGISTRY_KEY ${PIDGIN_REG_KEY} !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language" @@ -1097,8 +1095,7 @@ !macro RunCheckMacro UN Function ${UN}RunCheck Push $R0 -;TODO - fix this before committing - System::Call 'kernel32::OpenMutex(i 2031617, b 0, t "__pidgin_is_running") i .R0' + System::Call 'kernel32::OpenMutex(i 2031617, b 0, t "pidgin_is_running") i .R0' IntCmp $R0 0 done MessageBox MB_OK|MB_ICONEXCLAMATION $(PIDGIN_IS_RUNNING) /SD IDOK Abort @@ -1121,6 +1118,15 @@ StrCpy $GTK_THEME_SEL ${SecGtkWimp} StrCpy $SPELLCHECK_SEL "" + ;Try to copy the old Gaim installer Lang Reg. key + ClearErrors + ReadRegStr $R0 HKCU "${PIDGIN_REG_KEY}" "Installer Language" + IfErrors 0 +5 + ClearErrors + ReadRegStr $R0 HKCU "SOFTWARE\gaim" "Installer Language" + IfErrors +2 + WriteRegStr HKCU "${PIDGIN_REG_KEY}" "Installer Language" "$R0" + !insertmacro SetSectionFlag ${SecGtkThemes} ${SF_RO} !insertmacro UnselectSection ${SecGtkThemes} !insertmacro SelectSection $GTK_THEME_SEL