- Fixed eu alphabet to use unicode formatting.

	* src/boards/awele.c: (start_board), (set_level),
	(awele_create_item), (updateCapturedBeans): fix from Yves in 7_4 branch.
	* src/boards/python/guessnumber.py: realigned title
	* src/boards/smallnumbers.c: (key_press),
	(smallnumbers_destroy_all_items), (smallnumbers_create_item),
	(save_table), (conf_ok): use bar level dices (skins) instead of old gnome one.

31 files changed, 97 insertions, 41 deletions

diff --git a/ChangeLog b/ChangeLog
index 3fe0fd7..de02040 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+2006-02-03  Bruno coudoin  <bruno.coudoin@free.fr>
+
+	- Fixed eu alphabet to use unicode formatting.
+
+	* boards/sounds/eu/alphabet/c.ogg:
+	* boards/sounds/eu/alphabet/d.ogg:
+	* boards/sounds/eu/alphabet/e.ogg:
+	* boards/sounds/eu/alphabet/f.ogg:
+	* boards/sounds/eu/alphabet/g.ogg:
+	* boards/sounds/eu/alphabet/gcompris_alphabet_eu.assetml.in:
+	* boards/sounds/eu/alphabet/h.ogg:
+	* boards/sounds/eu/alphabet/i.ogg:
+	* boards/sounds/eu/alphabet/j.ogg:
+	* boards/sounds/eu/alphabet/k.ogg:
+	* boards/sounds/eu/alphabet/l.ogg:
+	* boards/sounds/eu/alphabet/m.ogg:
+	* boards/sounds/eu/alphabet/n.ogg:
+	* boards/sounds/eu/alphabet/o.ogg:
+	* boards/sounds/eu/alphabet/p.ogg:
+	* boards/sounds/eu/alphabet/q.ogg:
+	* boards/sounds/eu/alphabet/r.ogg:
+	* boards/sounds/eu/alphabet/s.ogg:
+	* boards/sounds/eu/alphabet/t.ogg:
+	* boards/sounds/eu/alphabet/u.ogg:
+	* boards/sounds/eu/alphabet/v.ogg:
+	* boards/sounds/eu/alphabet/w.ogg:
+	* boards/sounds/eu/alphabet/x.ogg:
+	* boards/sounds/eu/alphabet/y.ogg:
+	* boards/sounds/eu/alphabet/z.ogg:
+	* src/boards/awele.c: (start_board), (set_level),
+	(awele_create_item), (updateCapturedBeans): fix from Yves in 7_4 branch.
+	* src/boards/python/guessnumber.py: realigned title
+	* src/boards/smallnumbers.c: (key_press),
+	(smallnumbers_destroy_all_items), (smallnumbers_create_item),
+	(save_table), (conf_ok): use bar level dices (skins) instead of old gnome one.
+
 2006-02-02  Bruno coudoin  <bruno.coudoin@free.fr>
 
 	Updated audio voices for Portuguese by Jose Jorge
diff --git a/boards/sounds/eu/alphabet/U0061.ogg b/boards/sounds/eu/alphabet/U0061.ogg
new file mode 100644
index 0000000..6472208
--- /dev/null
+++ b/boards/sounds/eu/alphabet/U0061.ogg
diff --git a/boards/sounds/eu/alphabet/U0062.ogg b/boards/sounds/eu/alphabet/U0062.ogg
new file mode 100644
index 0000000..3bb5a65
--- /dev/null
+++ b/boards/sounds/eu/alphabet/U0062.ogg
diff --git a/boards/sounds/eu/alphabet/c.ogg b/boards/sounds/eu/alphabet/U0063.ogg
index bf4e1dd..bf4e1dd 100644
--- a/boards/sounds/eu/alphabet/c.ogg
+++ b/boards/sounds/eu/alphabet/U0063.ogg
diff --git a/boards/sounds/eu/alphabet/d.ogg b/boards/sounds/eu/alphabet/U0064.ogg
index c1dd46d..c1dd46d 100644
--- a/boards/sounds/eu/alphabet/d.ogg
+++ b/boards/sounds/eu/alphabet/U0064.ogg
diff --git a/boards/sounds/eu/alphabet/e.ogg b/boards/sounds/eu/alphabet/U0065.ogg
index 73a2cbd..73a2cbd 100644
--- a/boards/sounds/eu/alphabet/e.ogg
+++ b/boards/sounds/eu/alphabet/U0065.ogg
diff --git a/boards/sounds/eu/alphabet/f.ogg b/boards/sounds/eu/alphabet/U0066.ogg
index dca862f..dca862f 100644
--- a/boards/sounds/eu/alphabet/f.ogg
+++ b/boards/sounds/eu/alphabet/U0066.ogg
diff --git a/boards/sounds/eu/alphabet/g.ogg b/boards/sounds/eu/alphabet/U0067.ogg
index 460ab29..460ab29 100644
--- a/boards/sounds/eu/alphabet/g.ogg
+++ b/boards/sounds/eu/alphabet/U0067.ogg
diff --git a/boards/sounds/eu/alphabet/h.ogg b/boards/sounds/eu/alphabet/U0068.ogg
index 7b33047..7b33047 100644
--- a/boards/sounds/eu/alphabet/h.ogg
+++ b/boards/sounds/eu/alphabet/U0068.ogg
diff --git a/boards/sounds/eu/alphabet/i.ogg b/boards/sounds/eu/alphabet/U0069.ogg
index 56c155c..56c155c 100644
--- a/boards/sounds/eu/alphabet/i.ogg
+++ b/boards/sounds/eu/alphabet/U0069.ogg
diff --git a/boards/sounds/eu/alphabet/j.ogg b/boards/sounds/eu/alphabet/U006A.ogg
index ac3a8cb..ac3a8cb 100644
--- a/boards/sounds/eu/alphabet/j.ogg
+++ b/boards/sounds/eu/alphabet/U006A.ogg
diff --git a/boards/sounds/eu/alphabet/k.ogg b/boards/sounds/eu/alphabet/U006B.ogg
index a4a6a43..a4a6a43 100644
--- a/boards/sounds/eu/alphabet/k.ogg
+++ b/boards/sounds/eu/alphabet/U006B.ogg
diff --git a/boards/sounds/eu/alphabet/l.ogg b/boards/sounds/eu/alphabet/U006C.ogg
index a24dd25..a24dd25 100644
--- a/boards/sounds/eu/alphabet/l.ogg
+++ b/boards/sounds/eu/alphabet/U006C.ogg
diff --git a/boards/sounds/eu/alphabet/m.ogg b/boards/sounds/eu/alphabet/U006D.ogg
index e62773a..e62773a 100644
--- a/boards/sounds/eu/alphabet/m.ogg
+++ b/boards/sounds/eu/alphabet/U006D.ogg
diff --git a/boards/sounds/eu/alphabet/n.ogg b/boards/sounds/eu/alphabet/U006E.ogg
index eacdaf5..eacdaf5 100644
--- a/boards/sounds/eu/alphabet/n.ogg
+++ b/boards/sounds/eu/alphabet/U006E.ogg
diff --git a/boards/sounds/eu/alphabet/o.ogg b/boards/sounds/eu/alphabet/U006F.ogg
index ec3e11c..ec3e11c 100644
--- a/boards/sounds/eu/alphabet/o.ogg
+++ b/boards/sounds/eu/alphabet/U006F.ogg
diff --git a/boards/sounds/eu/alphabet/p.ogg b/boards/sounds/eu/alphabet/U0070.ogg
index 7bb2ff0..7bb2ff0 100644
--- a/boards/sounds/eu/alphabet/p.ogg
+++ b/boards/sounds/eu/alphabet/U0070.ogg
diff --git a/boards/sounds/eu/alphabet/q.ogg b/boards/sounds/eu/alphabet/U0071.ogg
index 3d18b35..3d18b35 100644
--- a/boards/sounds/eu/alphabet/q.ogg
+++ b/boards/sounds/eu/alphabet/U0071.ogg
diff --git a/boards/sounds/eu/alphabet/r.ogg b/boards/sounds/eu/alphabet/U0072.ogg
index 1f7c051..1f7c051 100644
--- a/boards/sounds/eu/alphabet/r.ogg
+++ b/boards/sounds/eu/alphabet/U0072.ogg
diff --git a/boards/sounds/eu/alphabet/s.ogg b/boards/sounds/eu/alphabet/U0073.ogg
index 433031a..433031a 100644
--- a/boards/sounds/eu/alphabet/s.ogg
+++ b/boards/sounds/eu/alphabet/U0073.ogg
diff --git a/boards/sounds/eu/alphabet/t.ogg b/boards/sounds/eu/alphabet/U0074.ogg
index 5952d8e..5952d8e 100644
--- a/boards/sounds/eu/alphabet/t.ogg
+++ b/boards/sounds/eu/alphabet/U0074.ogg
diff --git a/boards/sounds/eu/alphabet/u.ogg b/boards/sounds/eu/alphabet/U0075.ogg
index 79792bb..79792bb 100644
--- a/boards/sounds/eu/alphabet/u.ogg
+++ b/boards/sounds/eu/alphabet/U0075.ogg
diff --git a/boards/sounds/eu/alphabet/v.ogg b/boards/sounds/eu/alphabet/U0076.ogg
index afd5877..afd5877 100644
--- a/boards/sounds/eu/alphabet/v.ogg
+++ b/boards/sounds/eu/alphabet/U0076.ogg
diff --git a/boards/sounds/eu/alphabet/w.ogg b/boards/sounds/eu/alphabet/U0077.ogg
index 163ecee..163ecee 100644
--- a/boards/sounds/eu/alphabet/w.ogg
+++ b/boards/sounds/eu/alphabet/U0077.ogg
diff --git a/boards/sounds/eu/alphabet/x.ogg b/boards/sounds/eu/alphabet/U0078.ogg
index 56ebaf6..56ebaf6 100644
--- a/boards/sounds/eu/alphabet/x.ogg
+++ b/boards/sounds/eu/alphabet/U0078.ogg
diff --git a/boards/sounds/eu/alphabet/y.ogg b/boards/sounds/eu/alphabet/U0079.ogg
index 2a335c7..2a335c7 100644
--- a/boards/sounds/eu/alphabet/y.ogg
+++ b/boards/sounds/eu/alphabet/U0079.ogg
diff --git a/boards/sounds/eu/alphabet/z.ogg b/boards/sounds/eu/alphabet/U007A.ogg
index a886c36..a886c36 100644
--- a/boards/sounds/eu/alphabet/z.ogg
+++ b/boards/sounds/eu/alphabet/U007A.ogg
diff --git a/boards/sounds/eu/alphabet/gcompris_alphabet_eu.assetml.in b/boards/sounds/eu/alphabet/gcompris_alphabet_eu.assetml.in
index 26c1c2e..efa4c02 100644
--- a/boards/sounds/eu/alphabet/gcompris_alphabet_eu.assetml.in
+++ b/boards/sounds/eu/alphabet/gcompris_alphabet_eu.assetml.in
@@ -1,131 +1,131 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AssetML dataset="gcompris alphabet" rootdir="../gcompris/boards/sounds/en/alphabet/" locale="en">
-  <Asset file="a.ogg" mimetype="audio/x-ogg">
+  <Asset file="U0061.ogg" name='U0061.ogg' mimetype="audio/x-ogg">
    <_Description>a</_Description>
    <Credits>Jone de la Cruz Plazaola 2005 / GPL</Credits>
    <Categories>audio;alphabet</Categories>
   </Asset>
-  <Asset file="b.ogg" mimetype="audio/x-ogg">
+  <Asset file="U0062.ogg" name='U0062.ogg' mimetype="audio/x-ogg">
    <_Description>b</_Description>
    <Credits>Jone de la Cruz Plazaola 2005 / GPL</Credits>
    <Categories>audio;alphabet</Categories>
   </Asset>
-  <Asset file="c.ogg" mimetype="audio/x-ogg">
+  <Asset file="U0063.ogg" name='U0063.ogg' mimetype="audio/x-ogg">
    <_Description>c</_Description>
    <Credits>Jone de la Cruz Plazaola 2005 / GPL</Credits>
    <Categories>audio;alphabet</Categories>
   </Asset>
-  <Asset file="d.ogg" mimetype="audio/x-ogg">
+  <Asset file="U0064.ogg" name='U0064.ogg' mimetype="audio/x-ogg">
    <_Description>d</_Description>
    <Credits>Jone de la Cruz Plazaola 2005 / GPL</Credits>
    <Categories>audio;alphabet</Categories>
   </Asset>
-  <Asset file="e.ogg" mimetype="audio/x-ogg">
+  <Asset file="U0065.ogg" name='U0065.ogg' mimetype="audio/x-ogg">
    <_Description>e</_Description>
    <Credits>Jone de la Cruz Plazaola 2005 / GPL</Credits>
    <Categories>audio;alphabet</Categories>
   </Asset>
-  <Asset file="f.ogg" mimetype="audio/x-ogg">
+  <Asset file="U0066.ogg" name='U0066.ogg' mimetype="audio/x-ogg">
    <_Description>f</_Description>
    <Credits>Jone de la Cruz Plazaola 2005 / GPL</Credits>
    <Categories>audio;alphabet</Categories>
   </Asset>
-  <Asset file="g.ogg" mimetype="audio/x-ogg">
+  <Asset file="U0067.ogg" name='U0067.ogg' mimetype="audio/x-ogg">
    <_Description>g</_Description>
    <Credits>Jone de la Cruz Plazaola 2005 / GPL</Credits>
    <Categories>audio;alphabet</Categories>
   </Asset>
-  <Asset file="h.ogg" mimetype="audio/x-ogg">
+  <Asset file="U0068.ogg" name='U0068.ogg' mimetype="audio/x-ogg">
    <_Description>h</_Description>
    <Credits>Jone de la Cruz Plazaola 2005 / GPL</Credits>
    <Categories>audio;alphabet</Categories>
   </Asset>
-  <Asset file="i.ogg" mimetype="audio/x-ogg">
+  <Asset file="U0069.ogg" name='U0069.ogg' mimetype="audio/x-ogg">
    <_Description>i</_Description>
    <Credits>Jone de la Cruz Plazaola 2005 / GPL</Credits>
    <Categories>audio;alphabet</Categories>
   </Asset>
-  <Asset file="j.ogg" mimetype="audio/x-ogg">
+  <Asset file="U006A.ogg" name='U006A.ogg' mimetype="audio/x-ogg">
    <_Description>j</_Description>
    <Credits>Jone de la Cruz Plazaola 2005 / GPL</Credits>
    <Categories>audio;alphabet</Categories>
   </Asset>
-  <Asset file="k.ogg" mimetype="audio/x-ogg">
+  <Asset file="U006B.ogg" name='U006B.ogg' mimetype="audio/x-ogg">
    <_Description>k</_Description>
    <Credits>Jone de la Cruz Plazaola 2005 / GPL</Credits>
    <Categories>audio;alphabet</Categories>
   </Asset>
-  <Asset file="l.ogg" mimetype="audio/x-ogg">
+  <Asset file="U006C.ogg" name='U006C.ogg' mimetype="audio/x-ogg">
    <_Description>l</_Description>
    <Credits>Jone de la Cruz Plazaola 2005 / GPL</Credits>
    <Categories>audio;alphabet</Categories>
   </Asset>
-  <Asset file="m.ogg" mimetype="audio/x-ogg">
+  <Asset file="U006D.ogg" name='U006D.ogg' mimetype="audio/x-ogg">
    <_Description>m</_Description>
    <Credits>Jone de la Cruz Plazaola 2005 / GPL</Credits>
    <Categories>audio;alphabet</Categories>
   </Asset>
-  <Asset file="n.ogg" mimetype="audio/x-ogg">
+  <Asset file="U006E.ogg" name='U006E.ogg' mimetype="audio/x-ogg">
    <_Description>n</_Description>
    <Credits>Jone de la Cruz Plazaola 2005 / GPL</Credits>
    <Categories>audio;alphabet</Categories>
   </Asset>
-  <Asset file="o.ogg" mimetype="audio/x-ogg">
+  <Asset file="U006F.ogg" name='U006F.ogg' mimetype="audio/x-ogg">
    <_Description>o</_Description>
    <Credits>Jone de la Cruz Plazaola 2005 / GPL</Credits>
    <Categories>audio;alphabet</Categories>
   </Asset>
-  <Asset file="p.ogg" mimetype="audio/x-ogg">
+  <Asset file="U0070.ogg" name='U0070.ogg' mimetype="audio/x-ogg">
    <_Description>p</_Description>
    <Credits>Jone de la Cruz Plazaola 2005 / GPL</Credits>
    <Categories>audio;alphabet</Categories>
   </Asset>
-  <Asset file="q.ogg" mimetype="audio/x-ogg">
+  <Asset file="U0071.ogg" name='U0071.ogg' mimetype="audio/x-ogg">
    <_Description>q</_Description>
    <Credits>Jone de la Cruz Plazaola 2005 / GPL</Credits>
    <Categories>audio;alphabet</Categories>
   </Asset>
-  <Asset file="r.ogg" mimetype="audio/x-ogg">
+  <Asset file="U0072.ogg" name='U0072.ogg' mimetype="audio/x-ogg">
    <_Description>r</_Description>
    <Credits>Jone de la Cruz Plazaola 2005 / GPL</Credits>
    <Categories>audio;alphabet</Categories>
   </Asset>
-  <Asset file="s.ogg" mimetype="audio/x-ogg">
+  <Asset file="U0073.ogg" name='U0073.ogg' mimetype="audio/x-ogg">
    <_Description>s</_Description>
    <Credits>Jone de la Cruz Plazaola 2005 / GPL</Credits>
    <Categories>audio;alphabet</Categories>
   </Asset>
-  <Asset file="t.ogg" mimetype="audio/x-ogg">
+  <Asset file="U0074.ogg" name='U0074.ogg' mimetype="audio/x-ogg">
    <_Description>t</_Description>
    <Credits>Jone de la Cruz Plazaola 2005 / GPL</Credits>
    <Categories>audio;alphabet</Categories>
   </Asset>
-  <Asset file="u.ogg" mimetype="audio/x-ogg">
+  <Asset file="U0075.ogg" name='U0075.ogg' mimetype="audio/x-ogg">
    <_Description>u</_Description>
    <Credits>Jone de la Cruz Plazaola 2005 / GPL</Credits>
    <Categories>audio;alphabet</Categories>
   </Asset>
-  <Asset file="v.ogg" mimetype="audio/x-ogg">
+  <Asset file="U0076.ogg" name='U0076.ogg' mimetype="audio/x-ogg">
    <_Description>v</_Description>
    <Credits>Jone de la Cruz Plazaola 2005 / GPL</Credits>
    <Categories>audio;alphabet</Categories>
   </Asset>
-  <Asset file="w.ogg" mimetype="audio/x-ogg">
+  <Asset file="U0077.ogg" name='U0077.ogg' mimetype="audio/x-ogg">
    <_Description>w</_Description>
    <Credits>Jone de la Cruz Plazaola 2005 / GPL</Credits>
    <Categories>audio;alphabet</Categories>
   </Asset>
-  <Asset file="x.ogg" mimetype="audio/x-ogg">
+  <Asset file="U0078.ogg" name='U0078.ogg' mimetype="audio/x-ogg">
    <_Description>x</_Description>
    <Credits>Jone de la Cruz Plazaola 2005 / GPL</Credits>
    <Categories>audio;alphabet</Categories>
   </Asset>
-  <Asset file="y.ogg" mimetype="audio/x-ogg">
+  <Asset file="U0079.ogg" name='U0079.ogg' mimetype="audio/x-ogg">
    <_Description>y</_Description>
    <Credits>Jone de la Cruz Plazaola 2005 / GPL</Credits>
    <Categories>audio;alphabet</Categories>
   </Asset>
-  <Asset file="z.ogg" mimetype="audio/x-ogg">
+  <Asset file="U007A.ogg" name='U007A.ogg' mimetype="audio/x-ogg">
    <_Description>z</_Description>
    <Credits>Jone de la Cruz Plazaola 2005 / GPL</Credits>
    <Categories>audio;alphabet</Categories>
diff --git a/src/boards/awele.c b/src/boards/awele.c
index 8daabde..6ed6eb2 100644
--- a/src/boards/awele.c
+++ b/src/boards/awele.c
@@ -32,6 +32,7 @@ CALLBACK_ARGS *buttonClickArgs[6];
 static void start_board (GcomprisBoard * agcomprisBoard);
 static void pause_board (gboolean pause);
 static void end_board (void);
+static void set_level (guint level);
 static int gamewon;
 static void game_won (void);
 static void repeat(void);
@@ -65,7 +66,7 @@ static BoardPlugin menu_bp = {
 	is_our_board,		/* Return 1 if the plugin can handle the board file */
 	NULL,
 	NULL,
-	NULL,
+	set_level,
 	NULL,
 	repeat,
 	NULL,
@@ -109,9 +110,9 @@ start_board (GcomprisBoard * agcomprisBoard)
 
 		gcomprisBoard = agcomprisBoard;
 		gcomprisBoard->level = 1;
-		gcomprisBoard->maxlevel = 9;
+		gcomprisBoard->maxlevel = 4;
 		gcomprisBoard->sublevel = 1;
-		gcomprisBoard->number_of_sublevel = 10;	/* Go to next level after
+		gcomprisBoard->number_of_sublevel = 1;	/* Go to next level after
 							 * this number of 'play' */
 
 		str = gcompris_image_to_skin("button_reload.png");
@@ -174,6 +175,19 @@ static void repeat (){
 }
 
 
+static void
+set_level (guint level)
+{
+
+  if(gcomprisBoard!=NULL)
+    {
+      gcomprisBoard->level=level;
+      gcomprisBoard->sublevel = 1;
+      awele_next_level();
+    }
+}
+
+
 /*-------------------------------------------------------------------------------*/
 /*-------------------------------------------------------------------------------*/
 /*
@@ -477,8 +491,6 @@ awele_create_item (GnomeCanvasGroup * parent)
 						"anchor", GTK_ANCHOR_CENTER,
 						NULL);
 
-	gcomprisBoard->level = 1;
-
 	return NULL;
 }
 
@@ -788,6 +800,11 @@ updateCapturedBeans (GnomeCanvasItem * Captures[2])
 	{
 		sprintf (buffer, "%d", staticAwale->CapturedBeans[i]);
 		g_object_set (Captures[i], "text", buffer, NULL);
+		if (staticAwale->CapturedBeans[i] > 24)
+		  {
+		    gamewon = TRUE;
+		    gcompris_display_bonus(i==0, BONUS_FLOWER);
+		  }
 	}
 }
 
diff --git a/src/boards/python/guessnumber.py b/src/boards/python/guessnumber.py
index c4c742e..c5f5af9 100644
--- a/src/boards/python/guessnumber.py
+++ b/src/boards/python/guessnumber.py
@@ -223,7 +223,7 @@ class Gcompris_guessnumber:
       
       self.rootitem.add(
           gnome.canvas.CanvasText,
-          x=400.0 + 1.0,
+          x=340.0 + 1.0,
           y=30.0 + 1.0,
           font=gcompris.skin.get_font("gcompris/title"),
           text=(text),
@@ -233,7 +233,7 @@ class Gcompris_guessnumber:
 
       self.rootitem.add(
           gnome.canvas.CanvasText,
-          x=400.0,
+          x=340.0,
           y=30.0,
           font=gcompris.skin.get_font("gcompris/title"),
           text=(text),
diff --git a/src/boards/smallnumbers.c b/src/boards/smallnumbers.c
index beb01c3..e2ac9e3 100644
--- a/src/boards/smallnumbers.c
+++ b/src/boards/smallnumbers.c
@@ -1,6 +1,6 @@
 /* gcompris - smallnumbers.c
  *
- * Time-stamp: <2005/10/12 22:45:09 bruno>
+ * Time-stamp: <2006/02/03 21:11:30 bruno>
  *
  * Copyright (C) 2000 Bruno Coudoin
  * 
@@ -18,6 +18,7 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include <string.h>
 
 #include "gcompris/gcompris.h"
 
@@ -208,8 +209,6 @@ set_level (guint level)
 
 static gint key_press(guint keyval, gchar *commit_str, gchar *preedit_str)
 {
-  gchar *old_value;
-  gchar *old_name;
   char str[2];
 
   if(!gcomprisBoard || !boardRootItem)
@@ -298,7 +297,6 @@ static void smallnumbers_next_level()
 /* Destroy all the items */
 static void smallnumbers_destroy_all_items()
 {
-  GnomeCanvasItem *item;
 
   if(boardRootItem!=NULL)
     gtk_object_destroy (GTK_OBJECT(boardRootItem));
@@ -357,7 +355,6 @@ static void smallnumbers_create_item(GnomeCanvasGroup *parent)
   GdkPixbuf *smallnumbers_pixmap = NULL;
   GnomeCanvasItem *item;
   GnomeCanvasGroup *group_item;
-  char *str;
   guint i;
   char *lettersItem;
   char *str1 = NULL;
@@ -399,11 +396,13 @@ static void smallnumbers_create_item(GnomeCanvasGroup *parent)
     g_free(str1);
     g_free(str2);
 
-    str = g_strdup_printf("gcompris/dice/gnome-dice%c.png", numbers[i]);
+    str1 = g_strdup_printf("level%c.png", numbers[i]);
+    str2 = gcompris_image_to_skin(str1);
 
-    smallnumbers_pixmap = gcompris_load_pixmap(str);
+    smallnumbers_pixmap = gcompris_load_pixmap(str2);
 
-    g_free(str);
+    g_free(str1);
+    g_free(str2);
 
     if(x==0.0) {
       x = (double)(rand()%(gcomprisBoard->width-
@@ -489,6 +488,8 @@ static GHFunc save_table (gpointer key,
 			    board_conf,
 			    (gchar *) key, 
 			    (gchar *) value);
+
+  return NULL;
 }
 
 static GcomprisConfCallback conf_ok(GHashTable *table)
@@ -497,6 +498,8 @@ static GcomprisConfCallback conf_ok(GHashTable *table)
   
   board_conf = NULL;
   profile_conf = NULL;
+
+  return NULL;
 }
 
 static gboolean check_text(gchar *key, gchar *text, GtkLabel *label){