gcompris r3289 - in branches/gcomprixogoo: boards/skins/gartoon src/money-activity src/money-activity/resources/money

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Mon Mar 10 22:56:57 2008
New Revision: 3289
URL: http://svn.gnome.org/viewvc/gcompris?rev=3289&view=rev

Log:
merge from gcomprixogo r3288
made money_bg.png be locale to the money activity and no more
part of the skin.



Added:
   branches/gcomprixogoo/src/money-activity/resources/money/money-bg.png
      - copied unchanged from r3288, /branches/gcomprixo/src/money-activity/resources/money/money-bg.png
Removed:
   branches/gcomprixogoo/boards/skins/gartoon/money-bg.png
Modified:
   branches/gcomprixogoo/src/money-activity/money.c
   branches/gcomprixogoo/src/money-activity/resources/money/Makefile.am

Modified: branches/gcomprixogoo/src/money-activity/money.c
==============================================================================
--- branches/gcomprixogoo/src/money-activity/money.c	(original)
+++ branches/gcomprixogoo/src/money-activity/money.c	Mon Mar 10 22:56:57 2008
@@ -201,12 +201,9 @@
   guint		   number_of_item = 0;
   guint		   i;
   gchar		  *display_format;
-  gchar		  *img;
 
-  img = gc_skin_image_get("money-bg.png");
   gc_set_background(goo_canvas_get_root_item(gcomprisBoard->canvas),
-			  img);
-  g_free(img);
+		    "money/money-bg.png");
 
   gc_bar_set_level(gcomprisBoard);
 

Modified: branches/gcomprixogoo/src/money-activity/resources/money/Makefile.am
==============================================================================
--- branches/gcomprixogoo/src/money-activity/resources/money/Makefile.am	(original)
+++ branches/gcomprixogoo/src/money-activity/resources/money/Makefile.am	Mon Mar 10 22:56:57 2008
@@ -25,6 +25,7 @@
 	n50e.svgz \
 	n5e.svgz \
 	orange.svgz \
-	pamplemousse.svgz
+	pamplemousse.svgz \
+	money-bg.png
 
 EXTRA_DIST = $(img_DATA)