gcompris r3277 - in branches/gcomprixogoo/src/enumerate-activity: . resources/enumerate resources/enumerate/food

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Sun Mar  2 09:10:34 2008
New Revision: 3277
URL: http://svn.gnome.org/viewvc/gcompris?rev=3277&view=rev

Log:
removed food directory. enumarate activity was broken, food directory images
was not installed


Added:
   branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/baby_bottle.png
      - copied unchanged from r3276, /branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/food/baby_bottle.png
   branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/banana.png
      - copied unchanged from r3276, /branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/food/banana.png
   branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/bread_slice.png
      - copied unchanged from r3276, /branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/food/bread_slice.png
   branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/butter.png
      - copied unchanged from r3276, /branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/food/butter.png
   branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/chocolate.png
      - copied unchanged from r3276, /branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/food/chocolate.png
   branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/chocolate_cake.png
      - copied unchanged from r3276, /branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/food/chocolate_cake.png
   branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/cookie.png
      - copied unchanged from r3276, /branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/food/cookie.png
   branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/french_croissant.png
      - copied unchanged from r3276, /branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/food/french_croissant.png
   branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/grapefruit.png
      - copied unchanged from r3276, /branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/food/grapefruit.png
   branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/marmelade.png
      - copied unchanged from r3276, /branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/food/marmelade.png
   branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/milk_cup.png
      - copied unchanged from r3276, /branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/food/milk_cup.png
   branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/milk_shake.png
      - copied unchanged from r3276, /branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/food/milk_shake.png
   branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/orange.png
      - copied unchanged from r3276, /branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/food/orange.png
   branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/pear.png
      - copied unchanged from r3276, /branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/food/pear.png
   branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/round_cookie.png
      - copied unchanged from r3276, /branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/food/round_cookie.png
   branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/suggar_box.png
      - copied unchanged from r3276, /branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/food/suggar_box.png
   branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/yahourt.png
      - copied unchanged from r3276, /branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/food/yahourt.png
Removed:
   branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/food/
Modified:
   branches/gcomprixogoo/src/enumerate-activity/enumerate.c
   branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/README

Modified: branches/gcomprixogoo/src/enumerate-activity/enumerate.c
==============================================================================
--- branches/gcomprixogoo/src/enumerate-activity/enumerate.c	(original)
+++ branches/gcomprixogoo/src/enumerate-activity/enumerate.c	Sun Mar  2 09:10:34 2008
@@ -74,23 +74,23 @@
 // List of images to use in the game
 static gchar *imageList[] =
 {
-  "enumerate/food/banana.png",
-  "enumerate/food/orange.png",
-  "enumerate/food/milk_shake.png",
-  "enumerate/food/pear.png",
-  "enumerate/food/grapefruit.png",
-  "enumerate/food/yahourt.png",
-  "enumerate/food/milk_cup.png",
-  "enumerate/food/suggar_box.png",
-  "enumerate/food/butter.png",
-  "enumerate/food/chocolate.png",
-  "enumerate/food/cookie.png",
-  "enumerate/food/french_croissant.png",
-  "enumerate/food/chocolate_cake.png",
-  "enumerate/food/marmelade.png",
-  "enumerate/food/baby_bottle.png",
-  "enumerate/food/bread_slice.png",
-  "enumerate/food/round_cookie.png",
+  "enumerate/banana.png",
+  "enumerate/orange.png",
+  "enumerate/milk_shake.png",
+  "enumerate/pear.png",
+  "enumerate/grapefruit.png",
+  "enumerate/yahourt.png",
+  "enumerate/milk_cup.png",
+  "enumerate/suggar_box.png",
+  "enumerate/butter.png",
+  "enumerate/chocolate.png",
+  "enumerate/cookie.png",
+  "enumerate/french_croissant.png",
+  "enumerate/chocolate_cake.png",
+  "enumerate/marmelade.png",
+  "enumerate/baby_bottle.png",
+  "enumerate/bread_slice.png",
+  "enumerate/round_cookie.png",
 };
 #define NUMBER_OF_IMAGES G_N_ELEMENTS(imageList)
 

Modified: branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/README
==============================================================================
--- branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/README	(original)
+++ branches/gcomprixogoo/src/enumerate-activity/resources/enumerate/README	Sun Mar  2 09:10:34 2008
@@ -1,3 +1,5 @@
 Images made by Herve CHANAL in 2006, Release under GPL.
 - enumerate_background.png
 
+Other images in this directory are by Franck Doucet released under GPL
+