[evolution/clutter-calendar-v2] Fix issue where clicks were wrongly manipulated.

[Srinivasa Ragavan <sragavan src gnome org>]

commit 9c35631e83b35b9a85dbd4d342fdadca32462249
Author: Srinivasa Ragavan <sragavan gnome org>
Date:   Fri Sep 17 09:51:22 2010 +0530

    Fix issue where clicks were wrongly manipulated.

 calendar/gui/e-week-view-clutter-event-item.c |   21 ++++-----------------
 calendar/gui/e-week-view-layout.c             |    4 +++-
 2 files changed, 7 insertions(+), 18 deletions(-)
---
diff --git a/calendar/gui/e-week-view-clutter-event-item.c b/calendar/gui/e-week-view-clutter-event-item.c
index e3c47b2..ea0ffe6 100644
--- a/calendar/gui/e-week-view-clutter-event-item.c
+++ b/calendar/gui/e-week-view-clutter-event-item.c
@@ -1699,18 +1699,12 @@ e_week_view_clutter_event_item_get_edit_text (EWeekViewClutterEventItem *item)
 
 
 static void
-scale_delete_stage2 (ClutterAnimation *amim, ClutterActor *actor)
-{
-	clutter_actor_destroy (actor);
-}
-
-static void
 scale_delete_stage1 (ClutterAnimation *amim, ClutterActor *item)
 {
 	clutter_actor_animate (item, CLUTTER_EASE_IN_SINE,
 				200,
 				"scale-x", 0.1,
-				"signal-after::completed", scale_delete_stage2, item,
+				"signal-swapped-after::completed", clutter_actor_destroy, item,
 				NULL);
 	
 
@@ -1739,19 +1733,12 @@ e_week_view_clutter_event_item_scale_destroy (EWeekViewClutterEventItem *item)
 }
 
 
-static void
-fade_delete_stage1 (ClutterAnimation *amim, ClutterActor *actor)
-{
-	clutter_actor_destroy (actor);
-}
-
 void
 e_week_view_clutter_event_item_fade_destroy (EWeekViewClutterEventItem *item)
 {
-	clutter_actor_animate (item, CLUTTER_EASE_OUT_SINE,
-				200,
-				"opacity", 0.0,
-				"signal-after::completed", fade_delete_stage1, item,
+	clutter_actor_animate (item, CLUTTER_EASE_OUT_SINE, 200,
+				"opacity", 0,
+				"signal-swapped-after::completed", clutter_actor_destroy, item,
 				NULL);	
 }
 
diff --git a/calendar/gui/e-week-view-layout.c b/calendar/gui/e-week-view-layout.c
index 392ff1e..f9396a7 100644
--- a/calendar/gui/e-week-view-layout.c
+++ b/calendar/gui/e-week-view-layout.c
@@ -201,10 +201,12 @@ e_week_view_layout_event	(EWeekViewEvent	*event,
 					event->spans_index + span_num);
 				span.background_item = old_span->background_item;
 				span.text_item = old_span->text_item;
+#if HAVE_CLUTTER				
 				span.actor_item = old_span->actor_item;
+				old_span->actor_item = NULL;
+#endif				
 				old_span->background_item = NULL;
 				old_span->text_item = NULL;
-				old_span->actor_item = NULL;
 			}
 
 			g_array_append_val (spans, span);