From 5144fe509fc4c791d401269a4ff6a9d488e7b084 Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Sat, 23 Mar 2013 22:11:39 +0100 Subject: Revert "Migrator for servlist_ in the installers" This reverts commit c6ead740c8795dd9afea46ad392c153fbe47c675. --- win32/installer/hexchat-x64.skel.iss | 27 --------------------------- win32/installer/hexchat-x86.skel.iss | 27 --------------------------- 2 files changed, 54 deletions(-) (limited to 'win32') diff --git a/win32/installer/hexchat-x64.skel.iss b/win32/installer/hexchat-x64.skel.iss index fe55e7d3..4459922f 100644 --- a/win32/installer/hexchat-x64.skel.iss +++ b/win32/installer/hexchat-x64.skel.iss @@ -240,24 +240,6 @@ begin Result := 1; end; - -///////////////////////////////////////////////////////////////////// -procedure MigrateServlist(); -begin - FileCopy(ExpandConstant('{userappdata}\HexChat\servlist_.conf'), ExpandConstant('{userappdata}\HexChat\servlist.conf'), True); -end; - - -///////////////////////////////////////////////////////////////////// -function OldServlistCheck(): Boolean; -begin - if FileExists(ExpandConstant('{userappdata}\HexChat\servlist_.conf')) then - Result := True - else - Result := False -end; - - ///////////////////////////////////////////////////////////////////// procedure CurStepChanged(CurStep: TSetupStep); begin @@ -271,18 +253,9 @@ begin end; DeleteFile(ExpandConstant('{app}\portable-mode')); end; - - if (CurStep=ssPostInstall) then - begin - if OldServlistCheck() then begin - if SuppressibleMsgBox('Would you like to copy your old HexChat network list (servlist_.conf) to the new name (servlist.conf)? Make sure you remove servlist_.conf when you no longer need it.', mbConfirmation, MB_YESNO or MB_DEFBUTTON2, IDNO) = IDYES then - MigrateServlist(); - end; - end; end; end; - ///////////////////////////////////////////////////////////////////// // Importing LoadSkin API from ISSkin.DLL procedure LoadSkin(lpszPath: String; lpszIniFileName: String); diff --git a/win32/installer/hexchat-x86.skel.iss b/win32/installer/hexchat-x86.skel.iss index 12c1251b..b4c7d192 100644 --- a/win32/installer/hexchat-x86.skel.iss +++ b/win32/installer/hexchat-x86.skel.iss @@ -239,24 +239,6 @@ begin Result := 1; end; - -///////////////////////////////////////////////////////////////////// -procedure MigrateServlist(); -begin - FileCopy(ExpandConstant('{userappdata}\HexChat\servlist_.conf'), ExpandConstant('{userappdata}\HexChat\servlist.conf'), True); -end; - - -///////////////////////////////////////////////////////////////////// -function OldServlistCheck(): Boolean; -begin - if FileExists(ExpandConstant('{userappdata}\HexChat\servlist_.conf')) then - Result := True - else - Result := False -end; - - ///////////////////////////////////////////////////////////////////// procedure CurStepChanged(CurStep: TSetupStep); begin @@ -270,18 +252,9 @@ begin end; DeleteFile(ExpandConstant('{app}\portable-mode')); end; - - if (CurStep=ssPostInstall) then - begin - if OldServlistCheck() then begin - if SuppressibleMsgBox('Would you like to copy your old HexChat network list (servlist_.conf) to the new name (servlist.conf)? Make sure you remove servlist_.conf when you no longer need it.', mbConfirmation, MB_YESNO or MB_DEFBUTTON2, IDNO) = IDYES then - MigrateServlist(); - end; - end; end; end; - ///////////////////////////////////////////////////////////////////// // Importing LoadSkin API from ISSkin.DLL procedure LoadSkin(lpszPath: String; lpszIniFileName: String); -- cgit 1.4.1