gcompris r3651 - in trunk: . boards boards/melody/guitar src/boards

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Mon Dec 22 01:10:08 2008
New Revision: 3651
URL: http://svn.gnome.org/viewvc/gcompris?rev=3651&view=rev

Log:
	* 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:
   trunk/boards/melody/guitar/background.png
Modified:
   trunk/ChangeLog
   trunk/boards/geography_country.xml.in
   trunk/src/boards/reading.c

Modified: trunk/boards/geography_country.xml.in
==============================================================================
--- trunk/boards/geography_country.xml.in	(original)
+++ trunk/boards/geography_country.xml.in	Mon Dec 22 01:10:08 2008
@@ -4,7 +4,7 @@
 	 name="geography_country"
 	 type="shapegame"
 	 section="/discovery/miscelaneous"
-	 icon="boardicons/globe.svg"
+	 icon="boardicons/france_region.svg"
 	 mandatory_sound_file="voices/$LOCALE/geography/peru.ogg"
 	 difficulty="2"
 	 author="Jean-Philippe Ayanides (jp ayanides free fr)"

Modified: trunk/src/boards/reading.c
==============================================================================
--- trunk/src/boards/reading.c	(original)
+++ trunk/src/boards/reading.c	Mon Dec 22 01:10:08 2008
@@ -564,7 +564,6 @@
 				"y", y_offset,
 				NULL);
 
-  gdk_pixbuf_unref(button_pixmap);
   gtk_signal_connect(GTK_OBJECT(item1), "event",
 		     (GtkSignalFunc) item_event_valid,
 		     "R");
@@ -580,6 +579,7 @@
 				"fill_color", "white",
 				NULL);
 
+  gdk_pixbuf_unref(button_pixmap);
   gtk_signal_connect(GTK_OBJECT(item2), "event",
 		     (GtkSignalFunc) item_event_valid,
 		     "R");
@@ -604,7 +604,6 @@
 				"y", y_offset,
 				NULL);
 
-  gdk_pixbuf_unref(button_pixmap);
   gtk_signal_connect(GTK_OBJECT(item), "event",
 		     (GtkSignalFunc) item_event_valid,
 		     "Y");
@@ -626,7 +625,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,
@@ -634,7 +632,6 @@
 				"y", y_offset,
 				NULL);
 
-  gdk_pixbuf_unref(button_pixmap);
   gtk_signal_connect(GTK_OBJECT(item), "event",
 		     (GtkSignalFunc) item_event_valid,
 		     "N");
@@ -650,6 +647,7 @@
 				"fill_color", "white",
 				NULL);
 
+  gdk_pixbuf_unref(button_pixmap);
   gtk_signal_connect(GTK_OBJECT(item), "event",
 		     (GtkSignalFunc) item_event_valid,
 		     "N");