[gcompris/gcomprixogoo] Fixed events on the canvas that where not taken in account.

[Bruno Coudoin <bcoudoin src gnome org>]

commit d47b91e346c4b857018a82b9151a78ab0653d1b4
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Thu Jan 7 23:35:32 2010 +0100

    Fixed events on the canvas that where not taken in account.
    
    Now clicking beside the fish does speed them like it was before.

 src/clickgame-activity/clickgame.c |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/src/clickgame-activity/clickgame.c b/src/clickgame-activity/clickgame.c
index 1549ead..445f94d 100644
--- a/src/clickgame-activity/clickgame.c
+++ b/src/clickgame-activity/clickgame.c
@@ -33,7 +33,6 @@ static GList *item2del_list = NULL;
 
 static GcomprisBoard *gcomprisBoard = NULL;
 
-static gulong event_handle_id;
 static gint move_items_id = 0;
 static gint animate_id = 0;
 static gint drop_items_id = 0;
@@ -249,9 +248,6 @@ canvas_event (GooCanvasItem  *item,
   gdouble mouse_y;
   int ii;
 
-  if(!event)
-    return FALSE;
-
   mouse_x = event->x;
   mouse_y = event->y;
 
@@ -369,9 +365,9 @@ static void clickgame_start (GcomprisBoard *agcomprisBoard)
 		 gcomprisBoard->number_of_sublevel);
   gc_bar_set(GC_BAR_LEVEL);
 
-  event_handle_id =
-    g_signal_connect(gcomprisBoard->canvas, "enter_notify_event",
-		     (GtkSignalFunc) canvas_event, NULL);
+  g_signal_connect(goo_canvas_get_root_item(gcomprisBoard->canvas),
+		   "enter_notify_event",
+		   (GtkSignalFunc) canvas_event, NULL);
   clickgame_next_level();
 
   clickgame_pause(FALSE);
@@ -385,8 +381,8 @@ clickgame_end ()
       clickgame_pause(TRUE);
       gc_score_end();
       clickgame_destroy_all_items();
-      g_signal_handler_disconnect(gcomprisBoard->canvas,
-			    event_handle_id);
+      g_signal_handlers_disconnect_by_func(goo_canvas_get_root_item(gcomprisBoard->canvas),
+					   (GtkSignalFunc) canvas_event, NULL);
       gcomprisBoard->level = 1;       // Restart this game to zero
     }
   gcomprisBoard = NULL;