release 3.0R3_0

6 files changed, 31 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index b99fdb8..6573b1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,14 @@
-2003-05-08  Bruno Coudoin  <set EMAIL_ADDRESS environment variable>
+2003-05-18  Bruno Coudoin  bruno.coudoin@free.fr
+
+	* configure.in: now release 3.0
+	* gcompris.spec.in: added references to python
+	* src/boards/hanoi.c: (item_event): added a canvas update
+	* src/boards/python/pythontest.py: added a text presenting python
+	* src/boards/shapegame.c: (item_event_ok): removed canvas update
+	* src/gcompris/bar.c: (gcompris_bar_set): removed canvas update
+	* src/boards/missingletter.c: fixed button.png reference to skins now
+
+2003-05-08  Bruno Coudoin  bruno.coudoin@free.fr
 
 	* boards/geography/board3_0.xml.in: completed properly
 	* boards/geography/board4_0.xml.in: completed properly
@@ -9,7 +19,7 @@
 	* src/boards/erase.c: (erase_create_item): added skin colors
 	* src/boards/shapegame.c: (item_event), (item_event_edition): fixed edit mode bug
 
-2003-05-06  Bruno Coudoin  <set EMAIL_ADDRESS environment variable>
+2003-05-06  Bruno Coudoin  bruno.coudoin@free.fr
 
 	* boards/geography/board3_0.xml.in: now puzzle is ordered
 	* boards/geography/board4_0.xml.in: now puzzle is ordered
@@ -19,7 +29,7 @@
 	This is a very big improvement over the old way of doing.
 	* src/gcompris/gameutil.c: (gcompris_dialog): Fixed to use the skin path
 
-2003-05-06  Bruno Coudoin  <set EMAIL_ADDRESS environment variable>
+2003-05-06  Bruno Coudoin  bruno.coudoin@free.fr
 
 	* boards/geography/Makefile.am: created the europe map
 	* boards/geography/board3_0.xml.in: created the europe map
diff --git a/configure.in b/configure.in
index 2589e60..6ea92c1 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(src/gcompris/gcompris.c)
-AM_INIT_AUTOMAKE(gcompris, 2.3)
+AM_INIT_AUTOMAKE(gcompris, 3.0)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
diff --git a/gcompris.spec.in b/gcompris.spec.in
index 55727d6..f3b0840 100644
--- a/gcompris.spec.in
+++ b/gcompris.spec.in
@@ -16,6 +16,7 @@ URL: 		http://savannah.gnu.org
 Docdir: 	%{prefix}/share/doc/gcompris-%{PACKAGE_VERSION}
 Requires:	gnome-libs libxml2 gdk-pixbuf %canvaspackage
 Requires:       gnuchess >= 5.02
+Requires:       python gnome-python gnome-python-canvas pygtk2.0
 Packager:       Bruno Coudoin <bcoudoin.coudoin@free.fr>
 
 %description
diff --git a/src/boards/hanoi.c b/src/boards/hanoi.c
index fa83e6a..0c73d7c 100644
--- a/src/boards/hanoi.c
+++ b/src/boards/hanoi.c
@@ -672,6 +672,10 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, PieceItem *data)
 	      /* Return to the original position */
 	      item_absolute_move (data->item     , data->x , data->y);
 	      item_absolute_move (data->item_text, data->xt, data->yt);
+
+	      /* FIXME : Workaround for bugged canvas */
+	      gnome_canvas_update_now(gcomprisBoard->canvas);
+
 	      return FALSE;
 	    }
 
@@ -688,6 +692,10 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, PieceItem *data)
 	      /* Return to the original position */
 	      item_absolute_move (data->item     , data->x , data->y);
 	      item_absolute_move (data->item_text, data->xt, data->yt);
+
+	      /* FIXME : Workaround for bugged canvas */
+	      gnome_canvas_update_now(gcomprisBoard->canvas);
+
 	      return FALSE;
 	    }
 
@@ -705,6 +713,9 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, PieceItem *data)
 	  item_absolute_move (data->item     , piece_dst->x , piece_dst->y);
 	  item_absolute_move (data->item_text, piece_dst->xt, piece_dst->yt);
 	  
+	  /* FIXME : Workaround for bugged canvas */
+	  gnome_canvas_update_now(gcomprisBoard->canvas);
+
 	  /* Swap values in the pieces */
 	  tmpx    = data->x;
 	  tmpy    = data->y;
@@ -730,7 +741,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, PieceItem *data)
 	  position[piece_src->i][piece_src->j] = piece_src;
 	  position[piece_dst->i][piece_dst->j] = piece_dst;
 
-	  dump_solution();
+	  //	  dump_solution();
 	  if(is_completed())
 	    {
 	      gamewon = TRUE;
diff --git a/src/boards/missingletter.c b/src/boards/missingletter.c
index 98c373f..92b8a69 100644
--- a/src/boards/missingletter.c
+++ b/src/boards/missingletter.c
@@ -273,7 +273,7 @@ static GnomeCanvasItem *missing_letter_create_item(GnomeCanvasGroup *parent)
 							    "x", (double) 0,
 							    "y", (double) 0,
 							    NULL));
-  button_pixmap = gcompris_load_pixmap("gcompris/buttons/button.png");
+  button_pixmap = gcompris_load_skin_pixmap("button.png");
   /* display the image */
   board = g_list_nth_data(board_list, board_number);
   assert(board != NULL);
diff --git a/src/boards/shapegame.c b/src/boards/shapegame.c
index 535c6e4..b913cd1 100644
--- a/src/boards/shapegame.c
+++ b/src/boards/shapegame.c
@@ -1,6 +1,6 @@
 /* gcompris - shapegame.c
  *
- * Time-stamp: <2003/05/08 02:00:19 bcoudoin>
+ * Time-stamp: <2003/05/18 01:33:36 bcoudoin>
  *
  * Copyright (C) 2000 Bruno Coudoin
  *
@@ -150,6 +150,7 @@ static Shape 		*create_shape(ShapeType type, char *name, char *pixmapfile,  Gnom
 static gboolean 	 increment_sublevel(void);
 static void 		 create_title(char *name, double x, double y, char *justification);
 static gint		 item_event_ok(GnomeCanvasItem *item, GdkEvent *event, gpointer data);
+static gint		 item_event_edition(GnomeCanvasItem *item, GdkEvent *event, Shape *shape);
 
 /* Description of this plugin */
 BoardPlugin menu_bp =
@@ -1306,7 +1307,7 @@ item_event_ok(GnomeCanvasItem *item, GdkEvent *event, gpointer data)
       gnome_canvas_item_show(root_item);
 
       /* FIXME : Workaround for bugged canvas */
-      gnome_canvas_update_now(gcomprisBoard->canvas);
+      //      gnome_canvas_update_now(gcomprisBoard->canvas);
 
     default:
       break;