cleanup, removed Timestamps in file headers

svn path=/branches/GCOMPRIS_8_3/; revision=3777

50 files changed, 96 insertions, 165 deletions

diff --git a/ChangeLog b/ChangeLog
index 74165dd..397e2ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-03-15  Bruno Coudoin  <bruno.coudoin@free.fr>
+
+	- Replaced letter that differenciate blocks for
+	  color blinds by ASCII symbols that are locale
+	  agnostic.
+	  merged from trunk 3775
+
+	* src/boards/hanoi.c: (hanoi_create_item):
+
 2009-03-14  Bruno coudoin  <bruno.coudoin@free.fr>
 
 	Recompiled gnuchess on windows with the link option
diff --git a/src/boards/algebra.c b/src/boards/algebra.c
index 33d9ba6..f85afb1 100644
--- a/src/boards/algebra.c
+++ b/src/boards/algebra.c
@@ -1,7 +1,5 @@
 /* gcompris - algebra.c
  *
- * Time-stamp: <2006/08/21 23:29:57 bruno>
- *
  * Copyright (C) 2000 Bruno Coudoin
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/src/boards/clickgame.c b/src/boards/clickgame.c
index e03a250..82c4c8d 100644
--- a/src/boards/clickgame.c
+++ b/src/boards/clickgame.c
@@ -1,7 +1,5 @@
 /* gcompris - clickgame.c
  *
- * Time-stamp: <2006/08/21 23:30:07 bruno>
- *
  * Copyright (C) 2000 Bruno Coudoin
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/src/boards/clockgame.c b/src/boards/clockgame.c
index 783d633..4cb17e7 100644
--- a/src/boards/clockgame.c
+++ b/src/boards/clockgame.c
@@ -1,7 +1,5 @@
 /* gcompris - clockgame.c
  *
- * Time-stamp: <2006/08/21 23:33:07 bruno>
- *
  * Copyright (C) 2000 Bruno Coudoin
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/src/boards/gletters.c b/src/boards/gletters.c
index 156ab5f..1d4cb0f 100644
--- a/src/boards/gletters.c
+++ b/src/boards/gletters.c
@@ -1,7 +1,5 @@
 /* gcompris - gletters.c
  *
- * Time-stamp: <2007-04-15 21:15:19 bruno>
- *
  * Copyright (C) 2000 Bruno Coudoin
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/src/boards/hanoi.c b/src/boards/hanoi.c
index f28f2b7..a6e2089 100644
--- a/src/boards/hanoi.c
+++ b/src/boards/hanoi.c
@@ -69,7 +69,7 @@ static int item_height;
 
 static guint colorlist [] =
   {
-    0x00FFFFFF,
+    0x00C0C0C0,
     0xA00000FF,
     0xF00000FF,
     0x00A000FF,
@@ -78,7 +78,7 @@ static guint colorlist [] =
     0x0000FFFF,
     0x505000FF,
     0xA0A000FF,
-    0xF0F000FF,
+    0xC0C080FF,
     0x005050FF,
     0x00A0A0FF,
     0x500050FF,
@@ -87,6 +87,24 @@ static guint colorlist [] =
   };
 #define NUMBER_OF_COLOR G_N_ELEMENTS(colorlist)
 
+static char symbollist [NUMBER_OF_COLOR] =
+  {
+    '!',
+    '/',
+    '<',
+    '>',
+    '&',
+    '~',
+    '#',
+    '{',
+    '%',
+    '|',
+    '?',
+    '}',
+    '=',
+    '+',
+    '*'
+  };
 
 /* Description of this plugin */
 static BoardPlugin menu_bp =
@@ -530,16 +548,16 @@ static GnomeCanvasItem *hanoi_create_item(GnomeCanvasGroup *parent)
 					    "width_units", (double)1,
 					    NULL);
 
-	      car[0] = 'a' + position[i][j]->color;
+	      car[0] = symbollist[position[i][j]->color];
 	      car[1] = '\0';
 
 	       position[i][j]->item_text = \
 		 gnome_canvas_item_new (boardRootItem,
 					gnome_canvas_text_get_type (),
 					"text", &car,
-					"font", gc_skin_font_board_tiny,
+					"font", "sans bold 14",
 					"x", (double) position[i][j]->xt,
-					"y", (double) position[i][j]->yt,
+					"y", (double) position[i][j]->yt - 3,
 					"anchor", GTK_ANCHOR_NORTH,
 					"fill_color", "white",
 					"justification", GTK_JUSTIFY_CENTER,
diff --git a/src/boards/memory.c b/src/boards/memory.c
index c529139..5d62d83 100644
--- a/src/boards/memory.c
+++ b/src/boards/memory.c
@@ -1,7 +1,5 @@
 /* gcompris - memory.c
  *
- * Time-stamp: <2006/08/21 23:33:28 bruno>
- *
  * Copyright (C) 2000 Bruno Coudoin
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/src/boards/menu2.c b/src/boards/menu2.c
index 878cb34..1548847 100644
--- a/src/boards/menu2.c
+++ b/src/boards/menu2.c
@@ -1,7 +1,5 @@
 /* gcompris - menu2.c
  *
- * Time-stamp: <2007-04-15 21:19:36 bruno>
- *
  * Copyright (C) 2000 Bruno Coudoin
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/src/boards/paratrooper.c b/src/boards/paratrooper.c
index 280bedb..ea8669d 100644
--- a/src/boards/paratrooper.c
+++ b/src/boards/paratrooper.c
@@ -1,7 +1,5 @@
 /* gcompris - paratrooper.c
  *
- * Time-stamp: <2006/08/21 23:34:30 bruno>
- *
  * Copyright (C) 2000 Bruno Coudoin
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/src/boards/planegame.c b/src/boards/planegame.c
index b826a98..36b7195 100644
--- a/src/boards/planegame.c
+++ b/src/boards/planegame.c
@@ -1,7 +1,5 @@
 /* gcompris - planegame.c
  *
- * Time-stamp: <2006/08/21 23:34:38 bruno>
- *
  * Copyright (C) 2000 Bruno Coudoin
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/src/boards/py-mod-gcompris.c b/src/boards/py-mod-gcompris.c
index 20d2b17..980a2f8 100644
--- a/src/boards/py-mod-gcompris.c
+++ b/src/boards/py-mod-gcompris.c
@@ -1,7 +1,5 @@
 /* gcompris - py-mod-gcompris.c
  *
- * Time-stamp: <2006/08/21 23:36:37 bruno>
- *
  * Copyright (C) 2003 Olivier Samyn <osamyn@ulb.ac.be>
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -1227,9 +1225,9 @@ py_gc_board_config_spin_int(PyObject* self, PyObject* args)
   /* Parse arguments */
   if(!PyArg_ParseTuple(args, "Ossiiii:gc_board_config_radio_buttons", &py_bconf, &label, &key, &min, &max, &step, &init))
     return NULL;
-  
+
   bconf = (pyGcomprisBoardConfigObject*)py_bconf;
-  
+
   return (PyObject *)pygobject_new((GObject*) \
 				   gc_board_config_spin_int(bconf->cdata, (const gchar *)label,
 						     key,
@@ -1246,7 +1244,7 @@ static PyObject*
 py_gc_board_conf_separator(PyObject* self, PyObject* args)
 {
   PyObject *py_bconf;
-  pyGcomprisBoardConfigObject * bconf; 
+  pyGcomprisBoardConfigObject * bconf;
 
   /* Parse arguments */
   if(!PyArg_ParseTuple(args, "O:gc_board_conf_separator", &py_bconf))
@@ -1271,7 +1269,7 @@ py_gc_board_config_combo_locales(PyObject* self, PyObject* args)
   if(!PyArg_ParseTuple(args, "Os:gc_board_config_combo_locales", &py_bconf, &init))
     return NULL;
   bconf = (pyGcomprisBoardConfigObject*)py_bconf;
-  
+
   return (PyObject *)pygobject_new((GObject*) \
 				   gc_board_config_combo_locales(bconf->cdata, init));
 }
diff --git a/src/boards/reading.c b/src/boards/reading.c
index 80ff647..7ddde6e 100644
--- a/src/boards/reading.c
+++ b/src/boards/reading.c
@@ -1,7 +1,5 @@
 /* gcompris - reading.c
  *
- * Time-stamp: <2006/08/21 23:34:48 bruno>
- *
  * Copyright (C) 2000 Bruno Coudoin
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/src/boards/shapegame.c b/src/boards/shapegame.c
index 3fdb49e..3f62f2c 100644
--- a/src/boards/shapegame.c
+++ b/src/boards/shapegame.c
@@ -1,7 +1,5 @@
 /* gcompris - shapegame.c
  *
- * Time-stamp: <2006/08/21 23:35:01 bruno>
- *
  * Copyright (C) 2000 Bruno Coudoin
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/src/boards/smallnumbers.c b/src/boards/smallnumbers.c
index 57770eb..7229b56 100644
--- a/src/boards/smallnumbers.c
+++ b/src/boards/smallnumbers.c
@@ -1,7 +1,5 @@
 /* gcompris - smallnumbers.c
  *
- * Time-stamp: <2007-04-15 21:17:41 bruno>
- *
  * Copyright (C) 2000 Bruno Coudoin
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/src/boards/wordsgame.c b/src/boards/wordsgame.c
index 765aa9e..ed2f089 100644
--- a/src/boards/wordsgame.c
+++ b/src/boards/wordsgame.c
@@ -1,7 +1,5 @@
 /* gcompris - wordsgame.c
  *
- * Time-stamp: <2007-04-15 21:17:08 bruno>
- *
  * Copyright (C) 2000 Bruno Coudoin
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -657,8 +655,8 @@ static GnomeCanvasItem *wordsgame_create_item(GnomeCanvasGroup *parent)
       gnome_canvas_item_move (item->rootitem,(double) (g_random_int()%(gcomprisBoard->width-(gint)(x2))),(double) 0);
   else
    {
-      double new_x = (double)( g_random_int()%gcomprisBoard->width); 
-      if ( new_x < -x1 )      
+      double new_x = (double)( g_random_int()%gcomprisBoard->width);
+      if ( new_x < -x1 )
 		new_x -=  x1;
       gnome_canvas_item_move (item->rootitem, new_x ,(double) 0);
    }
diff --git a/src/gcompris/about.c b/src/gcompris/about.c
index ae26c00..7f1f763 100644
--- a/src/gcompris/about.c
+++ b/src/gcompris/about.c
@@ -1,7 +1,5 @@
 /* gcompris - about.c
  *
- * Time-stamp: <2006/08/21 23:27:24 bruno>
- *
  * Copyright (C) 2000 Bruno Coudoin
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/src/gcompris/about.h b/src/gcompris/about.h
index 0490bbb..3240c9c 100644
--- a/src/gcompris/about.h
+++ b/src/gcompris/about.h
@@ -1,7 +1,5 @@
 /*  GCompris -- about.h
  *
- * Time-stamp: <2001/12/26 23:13:29 bruno>
- *
  * Copyright (C) 2000 Bruno Coudoin
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/gcompris/anim.c b/src/gcompris/anim.c
index 6f3a4b1..552ea7d 100644
--- a/src/gcompris/anim.c
+++ b/src/gcompris/anim.c
@@ -1,7 +1,5 @@
 /* gcompris - anim.c
  *
- * Time-stamp: <2005/02/13 11:59:55 joe>
- *
  * Copyright (C) 2005 Joe Neeman
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -58,7 +56,7 @@ gc_anim_load(char *filename)
   while(fscanf(f, "%99s", tmp) == 1)
     {
       GcomprisBoard   *gcomprisBoard = gc_board_get_current();
-      files = g_slist_append(files, 
+      files = g_slist_append(files,
                              g_strdup_printf("%s/%s", gcomprisBoard->board_dir, tmp));
     }
   fclose(f);
@@ -185,7 +183,7 @@ anim_tick(void *ignore)
       GcomprisAnimCanvasItem *a = (GcomprisAnimCanvasItem*)cur->data;
       if( gdk_pixbuf_animation_iter_advance( a->iter, NULL) )
         {
-          gnome_canvas_item_set((GnomeCanvasItem*)a->canvas, "pixbuf", 
+          gnome_canvas_item_set((GnomeCanvasItem*)a->canvas, "pixbuf",
                                 gdk_pixbuf_animation_iter_get_pixbuf(a->iter),
                                 NULL);
         }
diff --git a/src/gcompris/anim.h b/src/gcompris/anim.h
index 8c6d1a9..5260211 100644
--- a/src/gcompris/anim.h
+++ b/src/gcompris/anim.h
@@ -1,7 +1,5 @@
 /* gcompris - anim.h
  *
- * Time-stamp: <2005/02/13 11:59:55 joe>
- *
  * Copyright (C) 2000 Joe Neeman
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/src/gcompris/bar.c b/src/gcompris/bar.c
index 28245eb..516e600 100644
--- a/src/gcompris/bar.c
+++ b/src/gcompris/bar.c
@@ -1,7 +1,5 @@
 /* gcompris - bar.c
  *
- * Time-stamp: <2007-04-15 21:03:40 bruno>
- *
  * Copyright (C) 2000-2003 Bruno Coudoin
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/src/gcompris/board_config.c b/src/gcompris/board_config.c
index 3aff718..b01f5ed 100644
--- a/src/gcompris/board_config.c
+++ b/src/gcompris/board_config.c
@@ -1,7 +1,5 @@
 /* gcompris - board_config.c
  *
- * Time-stamp: <2006/08/21 23:27:57 bruno>
- *
  * Copyright (C) 2001 Pascal Georges
  *
  * This program is free software; you can redistribute it and/or modify
@@ -342,7 +340,7 @@ gc_board_config_spin_int(GcomprisBoardConf *config, const gchar *label, gchar *k
   gtk_spin_button_set_digits ( GTK_SPIN_BUTTON(spin), 0);
 
   gtk_spin_button_set_value ( GTK_SPIN_BUTTON(spin), (gdouble) init);
-  
+
   _gc_boardconf_key *u = g_malloc0(sizeof(_gc_boardconf_key));
   u->key = g_strdup(key);
   u->config = config;
@@ -352,7 +350,7 @@ gc_board_config_spin_int(GcomprisBoardConf *config, const gchar *label, gchar *k
 		    G_CALLBACK(spin_changed),
 		    u);
   g_signal_connect( G_OBJECT(spin),
-	  	"destroy", 
+	  	"destroy",
 		G_CALLBACK(_gc_destroy_boardconf_key),
 		u);
 
diff --git a/src/gcompris/bonus.c b/src/gcompris/bonus.c
index 0835791..10f55ad 100644
--- a/src/gcompris/bonus.c
+++ b/src/gcompris/bonus.c
@@ -1,7 +1,5 @@
 /* gcompris - bonus.c
  *
- * Time-stamp: <2001/10/15 01:10:21 bruno>
- *
  * Copyright (C) 2001 Pascal George
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gcompris/bonus.h b/src/gcompris/bonus.h
index 1f4296a..0532ca4 100644
--- a/src/gcompris/bonus.h
+++ b/src/gcompris/bonus.h
@@ -1,7 +1,5 @@
 /* gcompris - bonus.h
  *
- * Time-stamp: <2001/10/15 01:10:21 bruno>
- *
  * Copyright (C) 2001 Pascal Georges
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gcompris/dialog.c b/src/gcompris/dialog.c
index 9c89f25..dca7b38 100644
--- a/src/gcompris/dialog.c
+++ b/src/gcompris/dialog.c
@@ -1,7 +1,5 @@
 /* gcompris - dialog.c
  *
- * Time-stamp: <2006/08/20 09:52:47 bruno>
- *
  * Copyright (C) 2000-2006 Bruno Coudoin
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/src/gcompris/file_selector.c b/src/gcompris/file_selector.c
index aad7a59..7309a7b 100644
--- a/src/gcompris/file_selector.c
+++ b/src/gcompris/file_selector.c
@@ -1,7 +1,5 @@
 /* gcompris - file_selector.c
  *
- * Time-stamp: <2006/08/20 10:29:31 bruno>
- *
  * Copyright (C) 2000 Bruno Coudoin
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/src/gcompris/gc_core.h b/src/gcompris/gc_core.h
index b5d4a72..ebe8267 100644
--- a/src/gcompris/gc_core.h
+++ b/src/gcompris/gc_core.h
@@ -1,7 +1,5 @@
 /* gcompris - gc_core.h
  *
- * Time-stamp: <2006/08/20 10:03:53 bruno>
- *
  * Copyright (C) 2006 Bruno Coudoin
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gcompris/gc_net.h b/src/gcompris/gc_net.h
index b8675b5..0b69de2 100644
--- a/src/gcompris/gc_net.h
+++ b/src/gcompris/gc_net.h
@@ -1,7 +1,5 @@
 /* gcompris - gc_net.h
  *
- * Time-stamp: <2000/07/16 00:32:26 bruno>
- *
  * Copyright (C) 2006 Bruno Coudoin
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gcompris/gcompris-board.h b/src/gcompris/gcompris-board.h
index 9d3697c..eb889fb 100644
--- a/src/gcompris/gcompris-board.h
+++ b/src/gcompris/gcompris-board.h
@@ -1,7 +1,5 @@
 /* gcompris - gcompris-board.h
  *
- * Time-stamp: <2005/09/21 22:14:01 yves>
- *
  * Copyright (C) 2000 Bruno Coudoin
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gcompris/gcompris.h b/src/gcompris/gcompris.h
index 07d6add..a34a08a 100644
--- a/src/gcompris/gcompris.h
+++ b/src/gcompris/gcompris.h
@@ -1,7 +1,5 @@
 /* gcompris - gcompris.h
  *
- * Time-stamp: <2006/08/20 10:03:53 bruno>
- *
  * Copyright (C) 2000,2001,2002 Bruno Coudoin
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gcompris/gcompris_alphabeta.c b/src/gcompris/gcompris_alphabeta.c
index 06f5b86..f0af6a2 100644
--- a/src/gcompris/gcompris_alphabeta.c
+++ b/src/gcompris/gcompris_alphabeta.c
@@ -1,7 +1,5 @@
 /* gcompris - gcompris_alphabeta.c
  *
- * Time-stamp: <2006/08/21 23:28:14 bruno>
- *
  * Copyright (C) 2000 Bruno Coudoin
  *
  * This program is free software; you can redistribute it and/or modify
@@ -46,13 +44,13 @@ gint gc_alphabeta (gboolean maximize,
   gint m, t, nextBest, index;
 
   g_assert (depth >= 0);
-  
+
   child = firstChild(treeGame);
 
   *bestChild = -1;
 
 /*   g_warning("gc_alphabeta %d %d %d", depth, alpha, beta); */
-  
+
   /* directly return value for leaf node*/
   if ((!child) || (depth == 0)){
 /*     g_warning("gc_alphabeta %d returns %d bestChild %d", depth, heuristic(treeGame), *bestChild); */
@@ -60,7 +58,7 @@ gint gc_alphabeta (gboolean maximize,
   }
 
   index = 0;
-      
+
   if (maximize) {
     m = alpha;
     while (child){
diff --git a/src/gcompris/gcompris_alphabeta.h b/src/gcompris/gcompris_alphabeta.h
index 2b00397..6d8f9f4 100644
--- a/src/gcompris/gcompris_alphabeta.h
+++ b/src/gcompris/gcompris_alphabeta.h
@@ -1,7 +1,5 @@
 /* gcompris - gcompris_alphabeta.h
  *
- * Time-stamp: <2006/08/28 21:20:56 bruno>
- *
  * Copyright (C) 2000 Bruno Coudoin
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gcompris/gcompris_config.h b/src/gcompris/gcompris_config.h
index 350d34a..061a10c 100644
--- a/src/gcompris/gcompris_config.h
+++ b/src/gcompris/gcompris_config.h
@@ -1,7 +1,5 @@
 /*  GCompris -- config.h
  *
- * Time-stamp: <2001/12/26 23:13:29 bruno>
- *
  * Copyright (C) 2000 Bruno Coudoin
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/gcompris/gcompris_confirm.c b/src/gcompris/gcompris_confirm.c
index 6cad190..542e5cc 100644
--- a/src/gcompris/gcompris_confirm.c
+++ b/src/gcompris/gcompris_confirm.c
@@ -1,7 +1,5 @@
 /* gcompris - gc_confirm_box.c
  *
- * Time-stamp: <2006/08/20 10:14:18 bruno>
- *
  * Copyright (C) 2000 Bruno Coudoin
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -37,7 +35,7 @@ static void              display_confirm(gchar *title,
 static gint
 button_event(GnomeCanvasItem *item, GdkEvent *event,  gchar *answer);
 
-static void              set_content(GnomeCanvasRichText *item_content, 
+static void              set_content(GnomeCanvasRichText *item_content,
 				     GnomeCanvasRichText *item_content_s,
 				     gchar *text);
 
@@ -89,15 +87,15 @@ static gdouble button_x_int;
 #define T_Z_H 115
 
 /* Buttons */
-#define T_B_X 80 
+#define T_B_X 80
 #define T_B_Y 250
-#define T_B_W 620 
+#define T_B_W 620
 #define T_B_H 192
 #define T_B_X_INT 30
 
 
 /*
- * Main entry point 
+ * Main entry point
  * ----------------
  *
  */
@@ -107,14 +105,14 @@ static gdouble button_x_int;
  * file_types is A Comma separated text explaining the different file types
  */
 
-void gc_confirm_box (gchar *title, 
+void gc_confirm_box (gchar *title,
 		       gchar *question_text,
 		       gchar *yes_text,
 		       gchar *no_text,
 		       ConfirmCallBack iscb)
 {
-  display_confirm(title, 
-		  question_text, 
+  display_confirm(title,
+		  question_text,
 		  yes_text,
 		  no_text,
 		  iscb);
@@ -141,7 +139,7 @@ void gc_confirm_box_stop ()
       gtk_object_destroy(GTK_OBJECT(rootitem));
     }
 
-  rootitem = NULL;	  
+  rootitem = NULL;
 
   if(gcomprisBoard!=NULL && confirm_displayed)
     gc_board_pause(FALSE);
@@ -216,7 +214,7 @@ display_confirm(gchar *title,
   x_start = (BOARDWIDTH)/2;
   item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem),
 				gnome_canvas_pixbuf_get_type (),
-				"pixbuf", pixmap, 
+				"pixbuf", pixmap,
 				"x", (double) x_start,
 				"y", (double) y_start,
 				"anchor", GTK_ANCHOR_NORTH,
@@ -274,11 +272,11 @@ display_confirm(gchar *title,
 				     "editable", FALSE,
 				     NULL);
 
-  set_content (GNOME_CANVAS_RICH_TEXT(richtext), 
-	       GNOME_CANVAS_RICH_TEXT(richtext_s), 
+  set_content (GNOME_CANVAS_RICH_TEXT(richtext),
+	       GNOME_CANVAS_RICH_TEXT(richtext_s),
 	       question_text);
-	 
-  
+
+
   /*
    * Buttons
    * -------
@@ -291,7 +289,7 @@ display_confirm(gchar *title,
   // CANCEL
   no_button = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem),
 				     gnome_canvas_pixbuf_get_type (),
-				     "pixbuf", pixmap, 
+				     "pixbuf", pixmap,
 				     "x", (double) button_x ,
 				     "y", (double) button_y + 2*button_h/3,
 				     "anchor", GTK_ANCHOR_WEST,
@@ -310,7 +308,7 @@ display_confirm(gchar *title,
   // CANCEL CROSS
   no_cross = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem),
 				    gnome_canvas_pixbuf_get_type (),
-				    "pixbuf", pixmap_cross, 
+				    "pixbuf", pixmap_cross,
 				    "x", (double) button_x  + gdk_pixbuf_get_width(pixmap)/2,
 				    "y", (double) button_y + 2*button_h/3,
 				    "anchor", GTK_ANCHOR_CENTER,
@@ -339,14 +337,14 @@ display_confirm(gchar *title,
   // OK
   yes_button = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem),
 				      gnome_canvas_pixbuf_get_type (),
-				      "pixbuf", pixmap, 
+				      "pixbuf", pixmap,
 				      "x", (double) button_x ,
 				      "y", (double) button_y + button_h/3,
 				      "anchor", GTK_ANCHOR_WEST,
 				      NULL);
-  
+
   gdk_pixbuf_unref(pixmap);
-  
+
   gtk_signal_connect(GTK_OBJECT(yes_button), "event",
 		     (GtkSignalFunc) button_event,
 		     "/yes/");
@@ -358,7 +356,7 @@ display_confirm(gchar *title,
   // OK stick
   yes_stick = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem),
 				     gnome_canvas_pixbuf_get_type (),
-				     "pixbuf", pixmap_stick, 
+				     "pixbuf", pixmap_stick,
 				     "x", (double) button_x + gdk_pixbuf_get_width(pixmap)/2,
 				     "y", (double) button_y + button_h/3,
 				     "anchor", GTK_ANCHOR_CENTER,
@@ -390,14 +388,14 @@ display_confirm(gchar *title,
 
 /* Apply the style to the given RichText item  */
 static void
-set_content(GnomeCanvasRichText *item_content, 
+set_content(GnomeCanvasRichText *item_content,
 	    GnomeCanvasRichText *item_content_s,
 	    gchar *text) {
 
   GtkTextIter    iter_start, iter_end;
   GtkTextBuffer *buffer;
   GtkTextTag    *txt_tag;
-  gboolean success; 
+  gboolean success;
   gchar *color_string;
   GdkColor *color_s = (GdkColor *)malloc(sizeof(GdkColor));
   GdkColor *color   = (GdkColor *)malloc(sizeof(GdkColor));
@@ -420,12 +418,12 @@ set_content(GnomeCanvasRichText *item_content,
   color_string = g_strdup_printf("#%x", gc_skin_color_shadow >> 8);
   gdk_color_parse(color_string, color_s);
   g_free(color_string);
-  success = gdk_colormap_alloc_color(gdk_colormap_get_system(), 
+  success = gdk_colormap_alloc_color(gdk_colormap_get_system(),
 				     color_s,
-  				     FALSE, TRUE); 
+  				     FALSE, TRUE);
 
   buffer  = gnome_canvas_rich_text_get_buffer(GNOME_CANVAS_RICH_TEXT(item_content_s));
-  txt_tag = gtk_text_buffer_create_tag(buffer, NULL, 
+  txt_tag = gtk_text_buffer_create_tag(buffer, NULL,
 				       "foreground-gdk", color_s,
 				       "font",       gc_skin_font_board_medium,
 				       NULL);
@@ -434,18 +432,18 @@ set_content(GnomeCanvasRichText *item_content,
   gtk_text_buffer_apply_tag(buffer, txt_tag, &iter_start, &iter_end);
 
 
-  /* 
+  /*
    * Set the text
    */
   color_string = g_strdup_printf("#%x", gc_skin_get_color("gcompris/helpunselect") >> 8);
   gdk_color_parse(color_string, color);
   g_free(color_string);
-  success = gdk_colormap_alloc_color(gdk_colormap_get_system(), 
+  success = gdk_colormap_alloc_color(gdk_colormap_get_system(),
 				     color,
-  				     FALSE, TRUE); 
+  				     FALSE, TRUE);
 
   buffer  = gnome_canvas_rich_text_get_buffer(GNOME_CANVAS_RICH_TEXT(item_content));
-  txt_tag = gtk_text_buffer_create_tag(buffer, NULL, 
+  txt_tag = gtk_text_buffer_create_tag(buffer, NULL,
 				       "foreground-gdk", color,
 				       "font",        gc_skin_font_board_medium,
 				       NULL);
@@ -474,5 +472,5 @@ button_event(GnomeCanvasItem *item, GdkEvent *event,  gchar *answer)
   gc_confirm_box_stop();
 
   return TRUE;
-  
+
 }
diff --git a/src/gcompris/gcompris_db.h b/src/gcompris/gcompris_db.h
index a265a07..c183150 100644
--- a/src/gcompris/gcompris_db.h
+++ b/src/gcompris/gcompris_db.h
@@ -1,7 +1,5 @@
 /* gcompris - gcompris_db.h
  *
- * Time-stamp: <2007/02/13 23:03:39 bruno>
- *
  * Copyright (C) 2005 Bruno Coudoin
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gcompris/gcompris_im.c b/src/gcompris/gcompris_im.c
index 46cddc4..3e3bfe3 100644
--- a/src/gcompris/gcompris_im.c
+++ b/src/gcompris/gcompris_im.c
@@ -1,7 +1,5 @@
 /* gcompris - gcompris_im.c
  *
- * Time-stamp: <2006/08/21 23:26:19 bruno>
- *
  * Copyright (C) 2000,2003 Bruno Coudoin
  *
  * This program is free software; you can redistribute it and/or modify
@@ -45,8 +43,8 @@ gc_im_init(GtkWidget *window)
   if(gc_profile_get_current())
     {
       GHashTable *init_im =  g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
-      init_im = gc_db_conf_with_table_get (gc_profile_get_current()->profile_id, 
-					      -1, 
+      init_im = gc_db_conf_with_table_get (gc_profile_get_current()->profile_id,
+					      -1,
 					      init_im );
 
       properties->default_context = g_hash_table_lookup ( init_im, "default_im");
@@ -71,7 +69,7 @@ gc_im_init(GtkWidget *window)
 
   g_signal_connect (GTK_WIDGET (window), "focus-out-event",
 		    G_CALLBACK(window_focus_callback), NULL);
- 
+
 }
 
 void
@@ -81,7 +79,7 @@ gc_im_reset()
   gtk_im_context_reset (properties->context);
 }
 
-    
+
 static gint
 im_context_commit_callback (GtkIMContext *imcontext,
 			    gchar *arg1,
@@ -95,7 +93,7 @@ im_context_commit_callback (GtkIMContext *imcontext,
     }
   return FALSE;
 }
-    
+
 static gint
 im_context_preedit_callback (GtkIMContext *imcontext,
 			     gpointer user_data)
@@ -129,6 +127,6 @@ window_focus_callback (GtkWidget *widget,
     gtk_im_context_focus_in (properties->context);
   else
     gtk_im_context_focus_out (properties->context);
-  
+
   return FALSE;
 }
diff --git a/src/gcompris/gcompris_im.h b/src/gcompris/gcompris_im.h
index 5240999..244c864 100644
--- a/src/gcompris/gcompris_im.h
+++ b/src/gcompris/gcompris_im.h
@@ -1,7 +1,5 @@
 /* gcompris - gcompris_im.h
  *
- * Time-stamp: <2006/08/29 01:18:09 bruno>
- *
  * Copyright (C) 2005 Bruno Coudoin
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gcompris/images_selector.c b/src/gcompris/images_selector.c
index f6cb334..505e159 100644
--- a/src/gcompris/images_selector.c
+++ b/src/gcompris/images_selector.c
@@ -1,7 +1,5 @@
 /* gcompris - images_selector.c
  *
- * Time-stamp: <2006/08/21 23:26:43 bruno>
- *
  * Copyright (C) 2000 Bruno Coudoin
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/src/gcompris/log.c b/src/gcompris/log.c
index 144a801..5c743cb 100644
--- a/src/gcompris/log.c
+++ b/src/gcompris/log.c
@@ -1,7 +1,5 @@
 /* gcompris - log.c
  *
- * Time-stamp: <2003/10/29 18:55:55 bcoudoin>
- *
  * Copyright (C) 2004 Bruno Coudoin
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/src/gcompris/menu.c b/src/gcompris/menu.c
index 5f95758..3f42998 100644
--- a/src/gcompris/menu.c
+++ b/src/gcompris/menu.c
@@ -1,7 +1,5 @@
 /* gcompris - menu.c
  *
- * Time-stamp: <2006/08/20 10:45:56 bruno>
- *
  * Copyright (C) 2000-2006 Bruno Coudoin
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/src/gcompris/plugin.h b/src/gcompris/plugin.h
index 1dbf82c..ff4e473 100644
--- a/src/gcompris/plugin.h
+++ b/src/gcompris/plugin.h
@@ -1,7 +1,5 @@
 /* gcompris - plugin.h
  *
- * Time-stamp: <2005/09/14 23:30:48 yves>
- *
  * Copyright (C) 2000 Bruno Coudoin
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/src/gcompris/profile.c b/src/gcompris/profile.c
index e07986f..ae296ce 100644
--- a/src/gcompris/profile.c
+++ b/src/gcompris/profile.c
@@ -1,7 +1,5 @@
 /* gcompris - profile.c
  *
- * Time-stamp: <2006/08/21 23:26:49 bruno>
- *
  * Copyright (C) 2005 Bruno Coudoin
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gcompris/profile.h b/src/gcompris/profile.h
index e8150d4..da787fe 100644
--- a/src/gcompris/profile.h
+++ b/src/gcompris/profile.h
@@ -1,7 +1,5 @@
 /* gcompris - profile.h
  *
- * Time-stamp: <2006/08/29 01:16:51 bruno>
- *
  * Copyright (C) 2005 Bruno Coudoin
  *
  * This program is free software; you can redistribute it and/or modify
@@ -67,7 +65,7 @@ struct _GcomprisGroup {
 
   /*name of group -- must be unique */
   gchar               *name;
-  
+
   /* GcomprisClass containing the group */
   gint                class_id;
 
@@ -100,7 +98,7 @@ struct _GcomprisUser {
 
   /* Last Name */
   gchar             *lastname;
-  
+
   /* First Name */
   gchar             *firstname;
 
@@ -128,7 +126,7 @@ typedef struct {
   gchar             *description;
 
   /* list of GcomprisGroup. if empty user management is disabled */
-  GList             *group_ids; 
+  GList             *group_ids;
 
   /* list of activities to play -- gchar section/name */
   GList             *activities;
diff --git a/src/gcompris/properties.c b/src/gcompris/properties.c
index 5bef184..9c9417e 100644
--- a/src/gcompris/properties.c
+++ b/src/gcompris/properties.c
@@ -1,7 +1,5 @@
 /* gcompris - properties.c
  *
- * Time-stamp: <2006/08/21 23:26:56 bruno>
- *
  * Copyright (C) 2000,2003 Bruno Coudoin
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gcompris/properties.h b/src/gcompris/properties.h
index 6be8d70..658b09f 100644
--- a/src/gcompris/properties.h
+++ b/src/gcompris/properties.h
@@ -1,7 +1,5 @@
 /* gcompris - properties.h
  *
- * Time-stamp: <2006/08/28 23:54:33 bruno>
- *
  * Copyright (C) 2000 Bruno Coudoin
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gcompris/score.c b/src/gcompris/score.c
index e775666..e3f41f6 100644
--- a/src/gcompris/score.c
+++ b/src/gcompris/score.c
@@ -1,7 +1,5 @@
 /* gcompris - score.c
  *
- * Time-stamp: <2006/08/21 23:27:04 bruno>
- *
  * Copyright (C) 2000 Bruno Coudoin
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -34,13 +32,13 @@ static ScoreStyleList currentStyle;
 /*
  * Forward declarations
  */
-static void display_number(GnomeCanvasGroup *parent, 
+static void display_number(GnomeCanvasGroup *parent,
 			   guint x,
-			   guint y, 
+			   guint y,
 			   char *operand_str);
 
 /*
- * Main entry score 
+ * Main entry score
  * ----------------
  *
  */
@@ -73,7 +71,7 @@ gc_score_end()
 {
   if(boardRootItem!=NULL)
     gtk_object_destroy (GTK_OBJECT(boardRootItem));
-  
+
   boardRootItem=NULL;
 }
 
@@ -126,9 +124,9 @@ gc_score_set(guint value)
 #define NUMBERSWIDTH       110
 
 static void
-display_number(GnomeCanvasGroup *parent, 
+display_number(GnomeCanvasGroup *parent,
 	       guint x,
-	       guint y, 
+	       guint y,
 	       char *operand_str)
 {
 
diff --git a/src/gcompris/score.h b/src/gcompris/score.h
index 04618a0..a0f2e18 100644
--- a/src/gcompris/score.h
+++ b/src/gcompris/score.h
@@ -1,7 +1,5 @@
 /* gcompris - bonus.h
  *
- * Time-stamp: <2001/10/15 01:10:21 bruno>
- *
  * Copyright (C) 2001 Bruno Coudoin
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gcompris/sdlplayer.c b/src/gcompris/sdlplayer.c
index 588323e..02c7424 100644
--- a/src/gcompris/sdlplayer.c
+++ b/src/gcompris/sdlplayer.c
@@ -1,7 +1,5 @@
 /* sdlplayer - sdlplayer.c
  *
- * Time-stamp: <2004/05/04 01:33:46 bcoudoin>
- *
  * Copyright (C) 2004 Bruno Coudoin
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gcompris/soundutil.h b/src/gcompris/soundutil.h
index 13a5c89..cfa8132 100644
--- a/src/gcompris/soundutil.h
+++ b/src/gcompris/soundutil.h
@@ -1,7 +1,5 @@
 /* gcompris - gameutil.h
  *
- * Time-stamp: <2000/07/16 00:32:26 bruno>
- *
  * Copyright (C) 2000 Bruno Coudoin
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/gcompris/timer.c b/src/gcompris/timer.c
index cdb7da7..86b8378 100644
--- a/src/gcompris/timer.c
+++ b/src/gcompris/timer.c
@@ -1,7 +1,5 @@
 /* gcompris - timer.c
  *
- * Time-stamp: <2001/10/15 01:10:21 bruno>
- *
  * Copyright (C) 2002 Bruno coudoin
  *
  * This program is free software; you can redistribute it and/or modify
@@ -84,7 +82,7 @@ gc_timer_display(int ax, int ay, TimerList atype, int second, GcomprisTimerEnd a
 	gchar		*filefull = NULL;
 	gchar		*filename = NULL;
 	gint		fileid;
-	
+
 	switch(type)
 	  {
 	  case GCOMPRIS_TIMER_SAND:
@@ -100,18 +98,18 @@ gc_timer_display(int ax, int ay, TimerList atype, int second, GcomprisTimerEnd a
 	fileid = (gint)timer;
 	filename = g_strdup_printf(image_prefix, fileid);
 	filefull = g_strdup_printf("%s/%s", properties->package_data_dir, filename);
-	
+
 	if (g_file_test ((filefull), G_FILE_TEST_EXISTS))
 	  {
 	    pixmap = gc_pixmap_load(filename);
 
 	    gc_timer_item = gnome_canvas_item_new (boardRootItem,
 						   gnome_canvas_pixbuf_get_type (),
-						   "pixbuf", pixmap, 
+						   "pixbuf", pixmap,
 						   "x", x,
 						   "y", y,
 						   NULL);
-	    
+
 	    gdk_pixbuf_unref(pixmap);
 	  }
 	g_free(filename);
@@ -138,7 +136,7 @@ gc_timer_display(int ax, int ay, TimerList atype, int second, GcomprisTimerEnd a
       pixmap = gc_pixmap_load("gcompris/misc/tuxballoon.png");
       gc_timer_item = gnome_canvas_item_new (boardRootItem,
 					     gnome_canvas_pixbuf_get_type (),
-					     "pixbuf", pixmap, 
+					     "pixbuf", pixmap,
 					     "x", x,
 					     "y", y,
 					     NULL);
@@ -151,7 +149,7 @@ gc_timer_display(int ax, int ay, TimerList atype, int second, GcomprisTimerEnd a
       pixmap = gc_pixmap_load("gcompris/misc/sea.png");
       gnome_canvas_item_new (boardRootItem,
 			     gnome_canvas_pixbuf_get_type (),
-			     "pixbuf", pixmap, 
+			     "pixbuf", pixmap,
 			     "x", (double) 0,
 			     "y", (double) BOARDHEIGHT - gdk_pixbuf_get_height(pixmap),
 			     "width", (double) gdk_pixbuf_get_width(pixmap),
@@ -204,7 +202,7 @@ gc_timer_pause(gboolean pause)
       if (animate_id)
 	gtk_timeout_remove (animate_id);
       animate_id = 0;
-      
+
       if (subanimate_id)
 	gtk_timeout_remove (subanimate_id);
       subanimate_id = 0;
diff --git a/src/gcompris/timer.h b/src/gcompris/timer.h
index 6993c0c..6c2f280 100644
--- a/src/gcompris/timer.h
+++ b/src/gcompris/timer.h
@@ -1,7 +1,5 @@
 /* gcompris - timer.h
  *
- * Time-stamp: <2001/10/15 01:10:21 bruno>
- *
  * Copyright (C) 2001 Pascal Georges
  *
  * This program is free software; you can redistribute it and/or modify