From f3f2ae5e9a444592fbaea9da7fc1aa873d671919 Mon Sep 17 00:00:00 2001
From: luca <luca@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 10 Sep 2007 15:06:53 +0000
Subject: [PATCH] Patch level         : Files correlati     : Ricompilazione
 Demo : [ ] Commento            :

git-svn-id: svn://10.65.10.50/trunk@15595 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 setup/Setup.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/setup/Setup.cpp b/setup/Setup.cpp
index 05c87a556..e3d966c0c 100755
--- a/setup/Setup.cpp
+++ b/setup/Setup.cpp
@@ -783,7 +783,7 @@ wxString CampoWizardPage4::DecodeString(const wxString& data)
 int CampoWizardPage4::VersionYear()
 {                                                             
   char ver[32];
-  GetPrivateProfileString("ba", "Versione", "", ver, sizeof(ver), "./program/install.ini");
+  GetPrivateProfileString("ba", "Versione", "", ver, sizeof(ver), "../program/install.ini");
   ver[4] = '\0';
   return atoi(ver);
 }
@@ -812,14 +812,13 @@ int CampoWizardPage4::DongleTest()
   if (yearKey < verYear) // Chiave gią programmata con assistenza pagata
 	{  
 		bool ok = false;
-		wxFileInputStream file("./program/dninst.zip");
+		wxFileInputStream file("../campo/dninst.zip");
 		if (file.IsOk())
 		{
       wxTextInputStream keys(file);
 			wxString line = keys.ReadLine();
 			srand(883);
-			DecodeString(line);
-			const int ass_year = atoi(line);
+			const int ass_year = atoi(DecodeString(line));
 			if (ass_year > yearKey) // Non devo abbassare l'anno di assistenza!
 			{
 				srand(ass_year);
@@ -838,7 +837,7 @@ int CampoWizardPage4::DongleTest()
 				{
 					const int n = ass_year%10;
 					const int y = (ass_year / 1000) * 1000 + (ass_year%1000) /10;
-					line.Printf("Il contratto di manutenzione %d/%d verrą attivato automaticamente", y, n);
+					line.Printf("Il contratto di manutenzione %d/%d verrą attivato automaticamente\ndurante l'installazione del software", y, n);
 					WarningBox(line);
 				}
 				else