more images by Franck Doucet especially the GNU bonus

	Changed the shapeboard data format to allow the passing of an image from the skins
	by using pixmapfile="skin:gcompris-shapelabel.png"
	changed all shapeboard that was usin gcompris-shapelabel and moved it to skins

	added the GNU bonus

	* boards/babymatch/board1_0.xml.in:
	* boards/babymatch/board2_0.xml.in:
	* boards/babymatch/board3_0.xml.in:
	* boards/babymatch/board4_0.xml.in:
	* boards/babymatch/board5_0.xml.in:
	* boards/babymatch/board6_0.xml.in:
	* boards/doubleentry/board3_0.xml.in:
	* boards/gcompris/bonus/gnu_bad.png:
	* boards/gcompris/bonus/gnu_good.png:
	* boards/gcompris/gcompris-shapelabel.jpg:
	* boards/gcompris/misc/glass.png:
	* boards/gcompris/misc/peer.png:
	* boards/imagename/board1_0.xml.in:
	* boards/imagename/board2_0.xml.in:
	* boards/imagename/board3_0.xml.in:
	* boards/imagename/board4_0.xml.in:
	* boards/imagename/board5_0.xml.in:
	* boards/imagename/board6_0.xml.in:
	* boards/money/money-bg.jpg:
	* boards/money/money-bg.png:
	* boards/paintings/board1_0.xml.in:
	* boards/paintings/board2_0.xml.in:
	* boards/paintings/board3_0.xml.in:
	* boards/paintings/board3_1.xml.in:
	* boards/paintings/board4_0.xml.in:
	* boards/paintings/board5_0.xml.in:
	* boards/paintings/board6_0.xml.in:
	* boards/scales/board1_0.xml.in:
	* boards/scales/board1_1.xml.in:
	* boards/scales/board1_2.xml.in:
	* boards/scales/board1_3.xml.in:
	* boards/scales/board1_4.xml.in:
	* boards/scales/board1_5.xml.in:
	* boards/scales/board2_0.xml.in:
	* boards/scales/board2_1.xml.in:
	* boards/scales/board2_2.xml.in:
	* boards/scales/board2_3.xml.in:
	* boards/scales/board2_4.xml.in:
	* boards/scales/board2_5.xml.in:
	* boards/scales/board3_0.xml.in:
	* boards/scales/board3_1.xml.in:
	* boards/scales/board3_2.xml.in:
	* boards/scales/board3_3.xml.in:
	* boards/scales/board3_4.xml.in:
	* boards/scales/board3_5.xml.in:
	* boards/skins/default/gcompris-shapelabel.png:
	* src/boards/colors.c: (process_ok_timeout): use the GNU bonus now
	* src/boards/money.c: (money_next_level): new background
	* src/boards/shapegame.c: (create_title), (add_xml_shape_to_data):
	* src/gcompris/bonus.c: (gcompris_display_bonus):
	* src/gcompris/bonus.h:
	* src/gcompris/skin.c: (gcompris_image_to_skin): do no more exit on error

18 files changed, 18 insertions, 18 deletions

diff --git a/boards/scales/board1_0.xml.in b/boards/scales/board1_0.xml.in
index bff867c..099299c 100644
--- a/boards/scales/board1_0.xml.in
+++ b/boards/scales/board1_0.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeGame OkIfAddedName="5">
-  <Shape name="1" pixmapfile="gcompris/gcompris-shapelabel.jpg" type="SHAPE_BACKGROUND"
+  <Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
 	 x="405" y="490" zoomx="1" zoomy="1" position="1"/>
   <Title x="394" y="490" justification="GTK_JUSTIFY_CENTER">
     <_name>Drag and Drop masses to equilibrate the scales</_name>
diff --git a/boards/scales/board1_1.xml.in b/boards/scales/board1_1.xml.in
index 33d3e14..1566853 100644
--- a/boards/scales/board1_1.xml.in
+++ b/boards/scales/board1_1.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeGame OkIfAddedName="7">
-  <Shape name="1" pixmapfile="gcompris/gcompris-shapelabel.jpg" type="SHAPE_BACKGROUND"
+  <Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
 	 x="405" y="460" zoomx="1" zoomy="1" position="0"/>
   <Title x="394" y="460" justification="GTK_JUSTIFY_CENTER">
     <_name>Drag and Drop masses to equilibrate the scales</_name>
diff --git a/boards/scales/board1_2.xml.in b/boards/scales/board1_2.xml.in
index 61e182f..172a500 100644
--- a/boards/scales/board1_2.xml.in
+++ b/boards/scales/board1_2.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeGame OkIfAddedName="8">
-  <Shape name="1" pixmapfile="gcompris/gcompris-shapelabel.jpg" type="SHAPE_BACKGROUND"
+  <Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
 	 x="405" y="460" zoomx="1" zoomy="1" position="0"/>
   <Title x="394" y="460" justification="GTK_JUSTIFY_CENTER">
     <_name>Drag and Drop masses to equilibrate the scales</_name>
diff --git a/boards/scales/board1_3.xml.in b/boards/scales/board1_3.xml.in
index dab34c0..e4fa2f1 100644
--- a/boards/scales/board1_3.xml.in
+++ b/boards/scales/board1_3.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeGame OkIfAddedName="10">
-  <Shape name="1" pixmapfile="gcompris/gcompris-shapelabel.jpg" type="SHAPE_BACKGROUND"
+  <Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
 	 x="405" y="460" zoomx="1" zoomy="1" position="0"/>
   <Title x="394" y="460" justification="GTK_JUSTIFY_CENTER">
     <_name>Drag and Drop masses to equilibrate the scales</_name>
diff --git a/boards/scales/board1_4.xml.in b/boards/scales/board1_4.xml.in
index 44c3b48..874691a 100644
--- a/boards/scales/board1_4.xml.in
+++ b/boards/scales/board1_4.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeGame OkIfAddedName="9">
-  <Shape name="1" pixmapfile="gcompris/gcompris-shapelabel.jpg" type="SHAPE_BACKGROUND"
+  <Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
 	 x="405" y="460" zoomx="1" zoomy="1" position="0"/>
   <Title x="394" y="460" justification="GTK_JUSTIFY_CENTER">
     <_name>Drag and Drop masses to equilibrate the scales</_name>
diff --git a/boards/scales/board1_5.xml.in b/boards/scales/board1_5.xml.in
index a7b6732..1cf312b 100644
--- a/boards/scales/board1_5.xml.in
+++ b/boards/scales/board1_5.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeGame OkIfAddedName="6">
-  <Shape name="1" pixmapfile="gcompris/gcompris-shapelabel.jpg" type="SHAPE_BACKGROUND"
+  <Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
 	 x="405" y="460" zoomx="1" zoomy="1" position="0"/>
   <Title x="394" y="460" justification="GTK_JUSTIFY_CENTER">
     <_name>Drag and Drop masses to equilibrate the scales</_name>
diff --git a/boards/scales/board2_0.xml.in b/boards/scales/board2_0.xml.in
index f22303f..e1bd2f6 100644
--- a/boards/scales/board2_0.xml.in
+++ b/boards/scales/board2_0.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeGame OkIfAddedName="10">
-  <Shape name="1" pixmapfile="gcompris/gcompris-shapelabel.jpg" type="SHAPE_BACKGROUND"
+  <Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
 	 x="405" y="460" zoomx="1" zoomy="1" position="0"/>
   <Title x="394" y="460" justification="GTK_JUSTIFY_CENTER">
     <_name>Drag and Drop masses to equilibrate the scales</_name>
diff --git a/boards/scales/board2_1.xml.in b/boards/scales/board2_1.xml.in
index e715fd9..c9a1a0c 100644
--- a/boards/scales/board2_1.xml.in
+++ b/boards/scales/board2_1.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeGame OkIfAddedName="12">
-  <Shape name="1" pixmapfile="gcompris/gcompris-shapelabel.jpg" type="SHAPE_BACKGROUND"
+  <Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
 	 x="405" y="460" zoomx="1" zoomy="1" position="0"/>
   <Title x="394" y="460" justification="GTK_JUSTIFY_CENTER">
     <_name>Drag and Drop masses to equilibrate the scales</_name>
diff --git a/boards/scales/board2_2.xml.in b/boards/scales/board2_2.xml.in
index 625d8b7..607d344 100644
--- a/boards/scales/board2_2.xml.in
+++ b/boards/scales/board2_2.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeGame OkIfAddedName="13">
-  <Shape name="1" pixmapfile="gcompris/gcompris-shapelabel.jpg" type="SHAPE_BACKGROUND"
+  <Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
 	 x="405" y="460" zoomx="1" zoomy="1" position="0"/>
   <Title x="394" y="460" justification="GTK_JUSTIFY_CENTER">
     <_name>Drag and Drop masses to equilibrate the scales</_name>
diff --git a/boards/scales/board2_3.xml.in b/boards/scales/board2_3.xml.in
index 2d95efb..889efec 100644
--- a/boards/scales/board2_3.xml.in
+++ b/boards/scales/board2_3.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeGame OkIfAddedName="14">
-  <Shape name="1" pixmapfile="gcompris/gcompris-shapelabel.jpg" type="SHAPE_BACKGROUND"
+  <Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
 	 x="405" y="460" zoomx="1" zoomy="1" position="0"/>
   <Title x="394" y="460" justification="GTK_JUSTIFY_CENTER">
     <_name>Drag and Drop masses to equilibrate the scales</_name>
diff --git a/boards/scales/board2_4.xml.in b/boards/scales/board2_4.xml.in
index ea6ec2f..83cb813 100644
--- a/boards/scales/board2_4.xml.in
+++ b/boards/scales/board2_4.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeGame OkIfAddedName="15">
-  <Shape name="1" pixmapfile="gcompris/gcompris-shapelabel.jpg" type="SHAPE_BACKGROUND"
+  <Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
 	 x="405" y="460" zoomx="1" zoomy="1" position="0"/>
   <Title x="394" y="460" justification="GTK_JUSTIFY_CENTER">
     <_name>Drag and Drop masses to equilibrate the scales</_name>
diff --git a/boards/scales/board2_5.xml.in b/boards/scales/board2_5.xml.in
index 6f6d6ed..5f12382 100644
--- a/boards/scales/board2_5.xml.in
+++ b/boards/scales/board2_5.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeGame OkIfAddedName="17">
-  <Shape name="1" pixmapfile="gcompris/gcompris-shapelabel.jpg" type="SHAPE_BACKGROUND"
+  <Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
 	 x="405" y="460" zoomx="1" zoomy="1" position="0"/>
   <Title x="394" y="460" justification="GTK_JUSTIFY_CENTER">
     <_name>Drag and Drop masses to equilibrate the scales</_name>
diff --git a/boards/scales/board3_0.xml.in b/boards/scales/board3_0.xml.in
index c0c1264..9dd6e7c 100644
--- a/boards/scales/board3_0.xml.in
+++ b/boards/scales/board3_0.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeGame OkIfAddedName="17">
-  <Shape name="1" pixmapfile="gcompris/gcompris-shapelabel.jpg" type="SHAPE_BACKGROUND"
+  <Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
 	 x="405" y="460" zoomx="1" zoomy="1" position="0"/>
   <Title x="394" y="460" justification="GTK_JUSTIFY_CENTER">
     <_name>Drag and Drop masses to equilibrate the scales</_name>
diff --git a/boards/scales/board3_1.xml.in b/boards/scales/board3_1.xml.in
index 87dc008..5b3bfea 100644
--- a/boards/scales/board3_1.xml.in
+++ b/boards/scales/board3_1.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeGame OkIfAddedName="19">
-  <Shape name="1" pixmapfile="gcompris/gcompris-shapelabel.jpg" type="SHAPE_BACKGROUND"
+  <Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
 	 x="405" y="460" zoomx="1" zoomy="1" position="0"/>
   <Title x="394" y="460" justification="GTK_JUSTIFY_CENTER">
     <_name>Drag and Drop masses to equilibrate the scales</_name>
diff --git a/boards/scales/board3_2.xml.in b/boards/scales/board3_2.xml.in
index 01e42d1..723c337 100644
--- a/boards/scales/board3_2.xml.in
+++ b/boards/scales/board3_2.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeGame OkIfAddedName="21">
-  <Shape name="1" pixmapfile="gcompris/gcompris-shapelabel.jpg" type="SHAPE_BACKGROUND"
+  <Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
 	 x="405" y="460" zoomx="1" zoomy="1" position="0"/>
   <Title x="394" y="460" justification="GTK_JUSTIFY_CENTER">
     <_name>Drag and Drop masses to equilibrate the scales</_name>
diff --git a/boards/scales/board3_3.xml.in b/boards/scales/board3_3.xml.in
index 8c3c7b5..97e0d46 100644
--- a/boards/scales/board3_3.xml.in
+++ b/boards/scales/board3_3.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeGame OkIfAddedName="22">
-  <Shape name="1" pixmapfile="gcompris/gcompris-shapelabel.jpg" type="SHAPE_BACKGROUND"
+  <Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
 	 x="405" y="460" zoomx="1" zoomy="1" position="0"/>
   <Title x="394" y="460" justification="GTK_JUSTIFY_CENTER">
     <_name>Drag and Drop masses to equilibrate the scales</_name>
diff --git a/boards/scales/board3_4.xml.in b/boards/scales/board3_4.xml.in
index e4cf698..d2e3751 100644
--- a/boards/scales/board3_4.xml.in
+++ b/boards/scales/board3_4.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeGame OkIfAddedName="25">
-  <Shape name="1" pixmapfile="gcompris/gcompris-shapelabel.jpg" type="SHAPE_BACKGROUND"
+  <Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
 	 x="405" y="460" zoomx="1" zoomy="1" position="0"/>
   <Title x="394" y="460" justification="GTK_JUSTIFY_CENTER">
     <_name>Drag and Drop masses to equilibrate the scales</_name>
diff --git a/boards/scales/board3_5.xml.in b/boards/scales/board3_5.xml.in
index cbbb13c..6bbd96d 100644
--- a/boards/scales/board3_5.xml.in
+++ b/boards/scales/board3_5.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ShapeGame OkIfAddedName="26">
-  <Shape name="1" pixmapfile="gcompris/gcompris-shapelabel.jpg" type="SHAPE_BACKGROUND"
+  <Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND"
 	 x="405" y="460" zoomx="1" zoomy="1" position="0"/>
   <Title x="394" y="460" justification="GTK_JUSTIFY_CENTER">
     <_name>Drag and Drop masses to equilibrate the scales</_name>