diff options
| author | Bruno Coudoin <bcoudoin@src.gnome.org> | 2009-03-12 20:55:18 (GMT) |
|---|---|---|
| committer | Bruno Coudoin <bcoudoin@src.gnome.org> | 2009-03-12 20:55:18 (GMT) |
| commit | b57e8489877e141a590d13518f92ef24f3ece634 (patch) | |
| tree | 6d772ab9b569cd501fc264e849d66053f905f3c6 | |
| parent | 276cb2603343d46746486a93b282081c6672440d (diff) | |
- Fixed a crash case by Miguel in the configuration.
in a languge setting configuration of an activity
if we change the language, gcompris crashes.
commit trunk 3769
svn path=/branches/GCOMPRIS_8_3/; revision=3770
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | src/gcompris/board_config_combo.c | 11 |
3 files changed, 20 insertions, 3 deletions
@@ -1,3 +1,13 @@ +2009-03-12 Bruno coudoin <bruno.coudoin@free.fr> + + - Fixed a crash case by Miguel in the configuration. + in a languge setting configuration of an activity + if we change the language, gcompris crashes. + commit trunk 3769 + + * src/gcompris/board_config_combo.c: + (gc_board_config_combo_locales_asset): + 2009-03-10 Bruno coudoin <bruno.coudoin@free.fr> Patch from Miguel that fixes the configuration diff --git a/configure.in b/configure.in index b6d14ed..3332825 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_HOST -AM_INIT_AUTOMAKE(gcompris, 8.3.10) +AM_INIT_AUTOMAKE(gcompris, 8.3.11) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE diff --git a/src/gcompris/board_config_combo.c b/src/gcompris/board_config_combo.c index 7fe3e52..391675a 100644 --- a/src/gcompris/board_config_combo.c +++ b/src/gcompris/board_config_combo.c @@ -453,13 +453,20 @@ GtkComboBox *gc_board_config_combo_locales_asset(GcomprisBoardConf *config, cons gtk_combo_box_set_active (GTK_COMBO_BOX(combobox), init_index); + _gc_boardconf_key *u = g_malloc0(sizeof(_gc_boardconf_key)); + u -> key = g_strdup("locale_sound"); + u -> config = config; + + g_signal_connect(G_OBJECT(combobox), + "destroy", + G_CALLBACK(_gc_destroy_boardconf_key), + u); g_signal_connect(G_OBJECT(combobox), "changed", G_CALLBACK(gc_board_config_combo_locales_changed), - "locale_sound"); + u); return GTK_COMBO_BOX(combobox); - } static void |