gcompris r3770 - in branches/GCOMPRIS_8_3: . src/gcompris

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Thu Mar 12 20:55:18 2009
New Revision: 3770
URL: http://svn.gnome.org/viewvc/gcompris?rev=3770&view=rev

Log:
	- 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



Modified:
   branches/GCOMPRIS_8_3/   (props changed)
   branches/GCOMPRIS_8_3/ChangeLog
   branches/GCOMPRIS_8_3/configure.in
   branches/GCOMPRIS_8_3/src/gcompris/board_config_combo.c

Modified: branches/GCOMPRIS_8_3/configure.in
==============================================================================
--- branches/GCOMPRIS_8_3/configure.in	(original)
+++ branches/GCOMPRIS_8_3/configure.in	Thu Mar 12 20:55:18 2009
@@ -2,7 +2,7 @@
 
 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
 

Modified: branches/GCOMPRIS_8_3/src/gcompris/board_config_combo.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/board_config_combo.c	(original)
+++ branches/GCOMPRIS_8_3/src/gcompris/board_config_combo.c	Thu Mar 12 20:55:18 2009
@@ -453,13 +453,20 @@
   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