From 78ed3a94e525f17c77d3eb51e392665a3dc6a6dd Mon Sep 17 00:00:00 2001
From: alex <alex@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Thu, 14 Dec 2006 11:04:57 +0000
Subject: [PATCH] Patch level         : 4.0 667 Files correlati     :
 Ricompilazione Demo : [ ] Commento            :

Riportata la versione 3.1 patch 766


git-svn-id: svn://10.65.10.50/trunk@14632 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 include/applicat.cpp |  7 +++----
 include/inst.cpp     | 17 ++++-------------
 include/inst.h       |  3 +--
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/include/applicat.cpp b/include/applicat.cpp
index e01ffc2e2..d87176e60 100755
--- a/include/applicat.cpp
+++ b/include/applicat.cpp
@@ -178,11 +178,10 @@ HIDDEN void paint_background(WINDOW win)
   xvt_dwin_draw_text(win, x, y, t, -1);
 
   xvtil_set_font(win, NULL, XVT_FS_NONE);
-//  TString spa; qui
-//  t = producer_name(spa);
-  w = xvt_dwin_get_text_width(win, t, -1);
+  const TString spa(dongle().reseller());
+  w = xvt_dwin_get_text_width(win, (const char *) spa, -1);
   x = (r.right-r.left-w)>>1; y = r.bottom-CHARY;
-  xvt_dwin_draw_text(win, x, y, t, -1);
+  xvt_dwin_draw_text(win, x, y, (const char *) spa, -1);
 
   if (ADVANCED_GRAPHICS)
   {
diff --git a/include/inst.cpp b/include/inst.cpp
index 81f5c313d..d3d71228f 100755
--- a/include/inst.cpp
+++ b/include/inst.cpp
@@ -1,11 +1,10 @@
 #include <inst.h>
 #include <config.h>
+#include <dongle.h>
 #include <prefix.h>
 #include <progind.h>
 #include "../ba/bainsta.h"
 
-#define  AUT_FILE		"campo.aut"
-
 // ********************************
 // classe TSystemtempfile
 // ********************************
@@ -501,18 +500,10 @@ bool TInstallmodule_app::install_com()
 
 void TInstallmodule_app::run(int argc, char* argv[])
 {
-  TScanner scanner(AUT_FILE);
- 
-  const int m = module_number();
-  for (int aut = 0; aut<=m; aut++)
-  {
-    scanner.line();
-  }
-  _modcode=scanner.token().left(2);
-  _modname=scanner.token().mid(3);
-  
+  const word m = module_number();
   TString title("Installazione ");
-  title << module_name();
+
+  title << dongle().module_code2name(m);
   TSkeleton_application::run(argc, argv,(const char* )title);
 }
 
diff --git a/include/inst.h b/include/inst.h
index 2cdb915e2..a5a50c91e 100755
--- a/include/inst.h
+++ b/include/inst.h
@@ -24,8 +24,7 @@ public:
 
   int dump(const char* to, int nkey = 1, char fs = '|', char fd = '\0', char rs = '\n', bool vis = TRUE, bool withdeleted = FALSE);
     
-  TSystemtempfile(int logicnum) :
-    TIsamtempfile(logicnum,NULL) {}
+  TSystemtempfile(int logicnum) : TIsamtempfile(logicnum,NULL) {}
 };
 
 class TStd_filename : public TFilename