gcompris r3629 - in branches/gcomprixogoo: . src/babymatch-activity src/canal_lock-activity/resources/canal_lock

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Tue Nov 25 00:24:51 2008
New Revision: 3629
URL: http://svn.gnome.org/viewvc/gcompris?rev=3629&view=rev

Log:
	* src/boards/shapegame.c: (item_event_drag): Fixed a crash in case of multiple sound list.
	  This was especially the case in the level 3 of the double entry activity.
          Merged from trunk Commit r3628
	* src/canal_lock-activity/resources/canal_lock/canal_lock.svgz: Created by
	  StÃphane Cabaraux tef/cyberground/org



Added:
   branches/gcomprixogoo/src/canal_lock-activity/resources/canal_lock/canal_lock.svgz   (contents, props changed)
Removed:
   branches/gcomprixogoo/src/canal_lock-activity/resources/canal_lock/canal_lock_bg.png
   branches/gcomprixogoo/src/canal_lock-activity/resources/canal_lock/tuxboat.png
Modified:
   branches/gcomprixogoo/ChangeLog
   branches/gcomprixogoo/src/babymatch-activity/shapegame.c
   branches/gcomprixogoo/src/canal_lock-activity/resources/canal_lock/Makefile.am

Modified: branches/gcomprixogoo/src/babymatch-activity/shapegame.c
==============================================================================
--- branches/gcomprixogoo/src/babymatch-activity/shapegame.c	(original)
+++ branches/gcomprixogoo/src/babymatch-activity/shapegame.c	Tue Nov 25 00:24:51 2008
@@ -940,16 +940,20 @@
 	       * of sound rather than a single one */
 	      char *p = NULL;
 	      char *soundfile = g_strdup(shape->soundfile);
+	      char *soundfiles = soundfile;
 
-	      while ((p = strstr (soundfile, " ")))
+	      while ((p = strstr (soundfiles, " ")))
 		{
 		  *p='\0';
-		  gc_sound_play_ogg(soundfile, NULL);
-		  soundfile = p + 1;
-		  g_warning("soundfile = %s\n", soundfile);
+		  gc_sound_play_ogg(soundfiles, NULL);
+		  soundfiles = p + 1;
+		  g_warning("soundfile = %s\n", soundfiles);
 		}
 
-	      gc_sound_play_ogg(soundfile, NULL);
+	      if (soundfiles != soundfile)
+		gc_sound_play_ogg(soundfiles, NULL);
+	      else
+		gc_sound_play_ogg(soundfile, NULL);
 	      g_free(soundfile);
 	    }
 	  break;

Modified: branches/gcomprixogoo/src/canal_lock-activity/resources/canal_lock/Makefile.am
==============================================================================
--- branches/gcomprixogoo/src/canal_lock-activity/resources/canal_lock/Makefile.am	(original)
+++ branches/gcomprixogoo/src/canal_lock-activity/resources/canal_lock/Makefile.am	Tue Nov 25 00:24:51 2008
@@ -1,6 +1,5 @@
 imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/canal_lock
 img_DATA = \
-	canal_lock_bg.png \
-	tuxboat.png
+	canal_lock.svgz
 
 EXTRA_DIST = $(img_DATA)

Added: branches/gcomprixogoo/src/canal_lock-activity/resources/canal_lock/canal_lock.svgz
==============================================================================
Binary file. No diff available.