Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Coudoin <bcoudoin@src.gnome.org>2006-02-20 21:05:03 (GMT)
committer Bruno Coudoin <bcoudoin@src.gnome.org>2006-02-20 21:05:03 (GMT)
commitfcfdbdb8d26488127323874e0fa7bbf9c63e4b5c (patch)
treee2a39f8067340e379af309fe241dafb9e59bba12
parent9364d5a162ad952ac3e7301c3013ae0f8704c1a0 (diff)
Applyed patch by Yves. A crash happens when starting playing sound
on some system.
-rw-r--r--ChangeLog12
-rw-r--r--configure.in2
-rw-r--r--src/gcompris/soundutil.c4
3 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0c849d1..b0ea82b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+ *** RELEASE 7.3.1 ***
+
+
+2006-02-20 Bruno coudoin <bruno.coudoin@free.fr>
+
+ Applyed patch by Yves. A crash happens when starting playing sound
+ on some system.
+
+ * configure.in:
+ * src/gcompris/soundutil.c: (default_sound_played_signal_handler),
+ (gcompris_sound_class_init):
+
*** RELEASE 7.3 ***
2006-02-18 Bruno coudoin <bruno.coudoin@free.fr>
diff --git a/configure.in b/configure.in
index 1bbf863..c38bbf2 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT(src/gcompris/gcompris.c)
AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(gcompris, 7.3)
+AM_INIT_AUTOMAKE(gcompris, 7.3.1)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
diff --git a/src/gcompris/soundutil.c b/src/gcompris/soundutil.c
index b4a0c25..b6c9502 100644
--- a/src/gcompris/soundutil.c
+++ b/src/gcompris/soundutil.c
@@ -501,7 +501,7 @@ gcompris_sound_instance_init (GTypeInstance *instance,
}
static void
-default_sound_played_signal_handler (GcomprisSound *obj, gchar *file)
+default_sound_played_signal_handler (GcomprisSound *obj, gchar *file, gpointer user_data)
{
/* Here, we trigger the real file write. */
g_warning ("sound_played: %s\n", file);
@@ -526,7 +526,7 @@ gcompris_sound_class_init (gpointer g_class,
gnome_canvas_marshal_VOID__POINTER,
G_TYPE_NONE /* return_type */,
1 /* n_params */,
- G_TYPE_CHAR /* param_types */);
+ G_TYPE_POINTER /* param_types */);
}