INTEGRATION: CWS fwkmerge1 (1.3.8); FILE MERGED

2004/02/18 12:59:20 lo 1.3.8.1: #i25371# move license dialog to Desktop::Main()

2 files changed, 13 insertions, 6 deletions

diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index 0a2ee67b791c..efdbdd40e8a9 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: userinstall.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: obo $ $Date: 2004-01-20 15:48:26 $
+ *  last change: $Author: hr $ $Date: 2004-03-09 11:07:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,6 +62,7 @@
 
 #include "userinstall.hxx"
 #include "langselect.hxx"
+#include "license.hxx"
 
 #include <stdio.h>
 
@@ -166,11 +167,16 @@ namespace desktop {
                 break;
             case Bootstrap::PATH_EXISTS:
                 // path exists, check if an installation lives there
-                if (aReadmeFile.open(0) == FileBase::E_None) return E_None;
+                if (aReadmeFile.open(0) == FileBase::E_None) {
+                    if (License::check()) return E_None;
+                    else return E_License;
+                }
             case Bootstrap::PATH_VALID:
                 // found a path but need to create user install
+                if (License::check())
                     return create_user_install(aUserInstallPath);
-                break;
+                else
+                    return E_License;
             default:
                 return E_Unknown;
         }
diff --git a/desktop/source/app/userinstall.hxx b/desktop/source/app/userinstall.hxx
index 3fac99a59a3e..f820feebd426 100644
--- a/desktop/source/app/userinstall.hxx
+++ b/desktop/source/app/userinstall.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: userinstall.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: obo $ $Date: 2004-01-20 15:48:49 $
+ *  last change: $Author: hr $ $Date: 2004-03-09 11:08:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,6 +74,7 @@ public:
         E_InvalidBaseinstall,   // corrupt base installation
         E_SetupFailed,          // external setup did not run correctly
         E_Configuration,        // error while accessing configuration
+        E_License,              // License not accepted
         E_Unknown               // unknown error
     };