# HG changeset patch # User Daniel Atallah # Date 1347333337 14400 # Node ID e576f52a2627d9e04974ea93dbc6494b139bf3fb # Parent 562961da7c0d650732c69d20a7725bfba0a2efe0 Combine duplicated ReserveFile sections in the win32 installer diff -r 562961da7c0d -r e576f52a2627 pidgin/win32/nsis/pidgin-installer.nsi --- a/pidgin/win32/nsis/pidgin-installer.nsi Mon Sep 10 23:15:35 2012 -0400 +++ b/pidgin/win32/nsis/pidgin-installer.nsi Mon Sep 10 23:15:37 2012 -0400 @@ -93,6 +93,7 @@ ;Reserve files used in .onInit ;for faster start-up ReserveFile "${NSISDIR}\Plugins\System.dll" +ReserveFile "${NSISDIR}\Plugins\UserInfo.dll" !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS !insertmacro MUI_RESERVEFILE_LANGDLL @@ -148,13 +149,6 @@ !include "${PIDGIN_NSIS_INCLUDE_PATH}\langmacros.nsh" ;-------------------------------- -;Reserve Files - ; Only need this if using bzip2 compression - - !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS - !insertmacro MUI_RESERVEFILE_LANGDLL - ReserveFile "${NSISDIR}\Plugins\UserInfo.dll" - ;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Start Install Sections ;;