gcompris r3670 - in branches/GCOMPRIS_8_3: . boards boards/melody/guitar src/boards

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Tue Jan 13 21:30:24 2009
New Revision: 3670
URL: http://svn.gnome.org/viewvc/gcompris?rev=3670&view=rev

Log:
	*** RELEASE 8.3.10 ***

2008-12-22  Bruno coudoin  <bruno coudoin free fr>

	use AC_CANONICAL_HOST rather than AC_CANONICAL_TARGET for cross-compile purposes.
	Without this change, a --target option to ./configure is emitted without a good
	reason, which is misleading.

	* configure.in:

2008-12-22  Bruno coudoin  <bruno coudoin free fr>

	* boards/geography_country.xml.in: putted back the france icon
	* src/boards/reading.c: (ask_ready), (ask_yes_no): fixed a potential crash case,
	  was using a dereferenced pixbuf.



Removed:
   branches/GCOMPRIS_8_3/boards/melody/guitar/background.png
Modified:
   branches/GCOMPRIS_8_3/   (props changed)
   branches/GCOMPRIS_8_3/ChangeLog
   branches/GCOMPRIS_8_3/boards/geography_country.xml.in
   branches/GCOMPRIS_8_3/configure.in
   branches/GCOMPRIS_8_3/src/boards/reading.c

Modified: branches/GCOMPRIS_8_3/boards/geography_country.xml.in
==============================================================================
--- branches/GCOMPRIS_8_3/boards/geography_country.xml.in	(original)
+++ branches/GCOMPRIS_8_3/boards/geography_country.xml.in	Tue Jan 13 21:30:24 2009
@@ -4,7 +4,7 @@
 	 name="geography_country"
 	 type="shapegame"
 	 section="/discovery/miscelaneous"
-	 icon="boardicons/globe.png"
+	 icon="boardicons/france_region.png"
 	 mandatory_sound_file="voices/$LOCALE/geography/peru.ogg"
 	 difficulty="2"
 	 author="Jean-Philippe Ayanides (jp ayanides free fr)"

Modified: branches/GCOMPRIS_8_3/configure.in
==============================================================================
--- branches/GCOMPRIS_8_3/configure.in	(original)
+++ branches/GCOMPRIS_8_3/configure.in	Tue Jan 13 21:30:24 2009
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(src/gcompris/gcompris.c)
-AC_CANONICAL_TARGET
+AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE(gcompris, 8.3.10)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE

Modified: branches/GCOMPRIS_8_3/src/boards/reading.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/boards/reading.c	(original)
+++ branches/GCOMPRIS_8_3/src/boards/reading.c	Tue Jan 13 21:30:24 2009
@@ -565,7 +565,6 @@
 				"y", y_offset,
 				NULL);
 
-  gdk_pixbuf_unref(button_pixmap);
   gtk_signal_connect(GTK_OBJECT(item1), "event",
 		     (GtkSignalFunc) item_event_valid,
 		     "R");
@@ -581,6 +580,7 @@
 				"fill_color", "white",
 				NULL);
 
+  gdk_pixbuf_unref(button_pixmap);
   gtk_signal_connect(GTK_OBJECT(item2), "event",
 		     (GtkSignalFunc) item_event_valid,
 		     "R");
@@ -605,7 +605,6 @@
 				"y", y_offset,
 				NULL);
 
-  gdk_pixbuf_unref(button_pixmap);
   gtk_signal_connect(GTK_OBJECT(item), "event",
 		     (GtkSignalFunc) item_event_valid,
 		     "Y");
@@ -627,7 +626,6 @@
 
   /*----- NO -----*/
   y_offset += 100;
-  button_pixmap = gc_skin_pixmap_load("button_large2.png");
   item = gnome_canvas_item_new (boardRootItem,
 				gnome_canvas_pixbuf_get_type (),
 				"pixbuf",  button_pixmap,
@@ -635,7 +633,6 @@
 				"y", y_offset,
 				NULL);
 
-  gdk_pixbuf_unref(button_pixmap);
   gtk_signal_connect(GTK_OBJECT(item), "event",
 		     (GtkSignalFunc) item_event_valid,
 		     "N");
@@ -651,6 +648,7 @@
 				"fill_color", "white",
 				NULL);
 
+  gdk_pixbuf_unref(button_pixmap);
   gtk_signal_connect(GTK_OBJECT(item), "event",
 		     (GtkSignalFunc) item_event_valid,
 		     "N");