Commit acfe8632 authored by Bruno Coudoin's avatar Bruno Coudoin

Fixed a crash in case of multiple sound list. This was especially the case

	* 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


svn path=/branches/gcomprixogoo/; revision=3629
parent 69f45387
2008-11-24 Bruno coudoin <bruno.coudoin@free.fr>
* 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
2008-11-24 Bruno coudoin <bruno.coudoin@free.fr>
* src/watercycle-activity/resources/watercycle/watercycle.svgz: Created by
Stéphane Cabaraux tef/cyberground/org
2008-11-21 Bruno coudoin <bruno.coudoin@free.fr> 2008-11-21 Bruno coudoin <bruno.coudoin@free.fr>
- Imported goocanvas commit r31, it allows animation to be - Imported goocanvas commit r31, it allows animation to be
......
...@@ -940,16 +940,20 @@ item_event_drag(GooCanvasItem *item, ...@@ -940,16 +940,20 @@ item_event_drag(GooCanvasItem *item,
* of sound rather than a single one */ * of sound rather than a single one */
char *p = NULL; char *p = NULL;
char *soundfile = g_strdup(shape->soundfile); char *soundfile = g_strdup(shape->soundfile);
char *soundfiles = soundfile;
while ((p = strstr (soundfile, " "))) while ((p = strstr (soundfiles, " ")))
{ {
*p='\0'; *p='\0';
gc_sound_play_ogg(soundfile, NULL); gc_sound_play_ogg(soundfiles, NULL);
soundfile = p + 1; soundfiles = p + 1;
g_warning("soundfile = %s\n", soundfile); 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); g_free(soundfile);
} }
break; break;
......
imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/canal_lock imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/canal_lock
img_DATA = \ img_DATA = \
canal_lock_bg.png \ canal_lock.svgz
tuxboat.png
EXTRA_DIST = $(img_DATA) EXTRA_DIST = $(img_DATA)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment