[gcompris/gcomprixogoo] No more request the activation code for the administation module.

[Bruno Coudoin <bcoudoin src gnome org>]

commit 736df9167e35aef01ce1569104931f281cc945f8
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Sun Feb 7 00:41:02 2010 +0100

    No more request the activation code for the administation module.

 src/gcompris/board.c    |    5 +----
 src/gcompris/gcompris.c |    5 ++++-
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/gcompris/board.c b/src/gcompris/board.c
index ca70c01..f0dd697 100644
--- a/src/gcompris/board.c
+++ b/src/gcompris/board.c
@@ -233,10 +233,7 @@ gc_board_check_file(GcomprisBoard *gcomprisBoard)
     return TRUE;
   }
 
-  if(properties->administration)
-    key_is_valid = 1;
-  else
-    key_is_valid = gc_activation_check(properties->key);
+  key_is_valid = gc_activation_check(properties->key);
 
   i = 0;
   if(key_is_valid >= 1)
diff --git a/src/gcompris/gcompris.c b/src/gcompris/gcompris.c
index fda24e1..1fe11e5 100644
--- a/src/gcompris/gcompris.c
+++ b/src/gcompris/gcompris.c
@@ -935,7 +935,7 @@ display_activation_dialog()
  * Return -1 if the code is not valid
  *        0  if the code is valid but out of date
  *        1  if the code is valid and under 2 years
- *        2  if the code is valid and under 2 years
+ *        2  for the demo code
  */
 gint gc_activation_check(const char *code)
 {
@@ -948,6 +948,9 @@ gint gc_activation_check(const char *code)
   char crc2 = 0;
   char codeddate[5];
 
+  if (properties->administration)
+    return 1;
+
   if(strlen(code) != 6)
     return -1;