[gcompris/gcomprixogoo] - From trunk

[Bruno Coudoin <bcoudoin src gnome org>]

commit 7349a285ec6ea1315c6aa49bfa7f4edf2b8d72b1
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Sun Jun 21 15:38:10 2009 +0200

    	- From trunk
    	- Patch from Miguel. On some windows manager, we were crashing
    	  when opening a configuration windows while in fullscreen.
    
    	* src/gcompris/board_config.c: (gc_board_config_window_display):

 ChangeLog                   |    6 +++++-
 src/gcompris/board_config.c |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5a521f0..5261131 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,9 +12,13 @@
 
 
 
+2009-06-21  Bruno coudoin  <bruno coudoin free fr>
 
+	- From trunk
+	- Patch from Miguel. On some windows manager, we were crashing
+	  when opening a configuration windows while in fullscreen.
 
-
+	* src/gcompris/board_config.c: (gc_board_config_window_display):
 
 2009-02-25  Bruno coudoin  <bruno coudoin free fr>
 
diff --git a/src/gcompris/board_config.c b/src/gcompris/board_config.c
index 406b456..81c6e1d 100644
--- a/src/gcompris/board_config.c
+++ b/src/gcompris/board_config.c
@@ -180,7 +180,7 @@ gc_board_config_window_display(gchar *label, GcomprisConfCallback callback)
       memset(&last_configure_event, 0, sizeof(GdkEventConfigure));
       gtk_widget_add_events(GTK_WIDGET(config->conf_window), GDK_STRUCTURE_MASK);
       gtk_signal_connect (GTK_OBJECT (config->conf_window), "configure_event",
-        GTK_SIGNAL_FUNC (_conf_window_configured), 0);
+        GTK_SIGNAL_FUNC (_conf_window_configured), config);
     }
   else
 #endif