summary refs log tree commit diff stats
path: root/win32
diff options
context:
space:
mode:
Diffstat (limited to 'win32')
-rw-r--r--win32/hexchat-xp.props2
-rw-r--r--win32/hexchat.props2
-rw-r--r--win32/installer/hexchat-xp-x64.skel.iss23
-rw-r--r--win32/installer/hexchat-xp-x86.skel.iss23
4 files changed, 48 insertions, 2 deletions
diff --git a/win32/hexchat-xp.props b/win32/hexchat-xp.props
index d212fbea..2d94ab14 100644
--- a/win32/hexchat-xp.props
+++ b/win32/hexchat-xp.props
@@ -11,7 +11,7 @@
     <YourPerl516Path>c:\mozilla-build\perl-5.16</YourPerl516Path>

     <YourPythonPath>c:\mozilla-build\python-2.7</YourPythonPath>

     <!-- YOU SHOULDN'T TOUCH ANYTHING BELOW -->

-	<!-- G_DISABLE_DEPRECATED is unfeasible due to g_completion_* -->

+    <!-- G_DISABLE_DEPRECATED is unfeasible due to g_completion_* -->

     <OwnFlags>G_DISABLE_CAST_CHECKS;GDK_PIXBUF_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;HAVE_STRTOULL;strtoull=_strtoui64;strcasecmp=stricmp;strncasecmp=strnicmp;__inline__=__inline;</OwnFlags>

     <DepsRoot>$(YourDepsPath)\$(PlatformName)</DepsRoot>

     <GendefPath>$(YourGendefPath)</GendefPath>

diff --git a/win32/hexchat.props b/win32/hexchat.props
index 7ba51f53..2281c69f 100644
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@@ -12,7 +12,7 @@
     <YourPerl516Path>c:\mozilla-build\perl-5.16</YourPerl516Path>

     <YourPythonPath>c:\mozilla-build\python-2.7</YourPythonPath>

     <!-- YOU SHOULDN'T TOUCH ANYTHING BELOW -->

-	<!-- G_DISABLE_DEPRECATED is unfeasible due to g_completion_* -->

+    <!-- G_DISABLE_DEPRECATED is unfeasible due to g_completion_* -->

     <OwnFlags>G_DISABLE_CAST_CHECKS;GDK_PIXBUF_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;HAVE_STRTOULL;strtoull=_strtoui64;strcasecmp=stricmp;strncasecmp=strnicmp;__inline__=__inline;</OwnFlags>

     <DepsRoot>$(YourDepsPath)\$(PlatformName)</DepsRoot>

     <GendefPath>$(YourGendefPath)</GendefPath>

diff --git a/win32/installer/hexchat-xp-x64.skel.iss b/win32/installer/hexchat-xp-x64.skel.iss
index e43b80e2..7661ef27 100644
--- a/win32/installer/hexchat-xp-x64.skel.iss
+++ b/win32/installer/hexchat-xp-x64.skel.iss
@@ -259,6 +259,21 @@ begin
 end;

 

 /////////////////////////////////////////////////////////////////////

+procedure MigrateConf();

+begin

+  FileCopy(ExpandConstant('{userappdata}\HexChat\xchat.conf'), ExpandConstant('{userappdata}\HexChat\hexchat.conf'), True);

+end;

+

+/////////////////////////////////////////////////////////////////////

+function ConfExistCheck(): Boolean;

+begin

+  if FileExists(ExpandConstant('{userappdata}\HexChat\xchat.conf')) then

+    Result := True

+  else

+    Result := False

+end;

+

+/////////////////////////////////////////////////////////////////////

 procedure CurStepChanged(CurStep: TSetupStep);

 begin

 	if not (IsTaskSelected('portable')) then

@@ -271,6 +286,14 @@ begin
 			end;

 			DeleteFile(ExpandConstant('{app}\portable-mode'));

 		end;

+

+		if (CurStep=ssPostInstall) then

+		begin

+			if ConfExistCheck() then begin

+				if SuppressibleMsgBox('Would you like to copy your old HexChat configuration file (xchat.conf) to the new name (hexchat.conf)? Make sure you remove xchat.conf when you no longer need it.', mbConfirmation, MB_YESNO or MB_DEFBUTTON2, IDNO) = IDYES then

+					MigrateConf();

+			end;

+		end;

 	end;

 end;

 

diff --git a/win32/installer/hexchat-xp-x86.skel.iss b/win32/installer/hexchat-xp-x86.skel.iss
index 8875ebad..0c27aeac 100644
--- a/win32/installer/hexchat-xp-x86.skel.iss
+++ b/win32/installer/hexchat-xp-x86.skel.iss
@@ -260,6 +260,21 @@ begin
 end;

 

 /////////////////////////////////////////////////////////////////////

+procedure MigrateConf();

+begin

+  FileCopy(ExpandConstant('{userappdata}\HexChat\xchat.conf'), ExpandConstant('{userappdata}\HexChat\hexchat.conf'), True);

+end;

+

+/////////////////////////////////////////////////////////////////////

+function ConfExistCheck(): Boolean;

+begin

+  if FileExists(ExpandConstant('{userappdata}\HexChat\xchat.conf')) then

+      Result := True

+  else

+    Result := False

+end;

+

+/////////////////////////////////////////////////////////////////////

 procedure CurStepChanged(CurStep: TSetupStep);

 begin

 	if not (IsTaskSelected('portable')) then

@@ -272,6 +287,14 @@ begin
 			end;

 			DeleteFile(ExpandConstant('{app}\portable-mode'));

 		end;

+

+		if (CurStep=ssPostInstall) then

+		begin

+			if ConfExistCheck() then begin

+				if SuppressibleMsgBox('Would you like to copy your old HexChat configuration file (xchat.conf) to the new name (hexchat.conf)? Make sure you remove xchat.conf when you no longer need it.', mbConfirmation, MB_YESNO or MB_DEFBUTTON2, IDNO) = IDYES then

+					MigrateConf();

+			end;

+		end;

 	end;

 end;