fixes #318777

svn path=/trunk/; revision=30693

2 files changed, 36 insertions, 5 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 9d06e9664e..af1dd19a22 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,13 @@
+2005-11-28  Chenthill Palanisamy  <pchenthill@novell.com>
+
+	Fixes #318777
+	* gui/e-cal-model.c: 
+	(add_instance_cb): Set the instance start as the started date for
+	the recurring instance.
+	(e_cal_view_objects_added_cb): 
+	(e_cal_view_objects_removed_cb): Check if the comp_data is removed
+	from the array before freeing the data.
+
 2005-11-26  Tor Lillqvist  <tml@novell.com>
 
 	* gui/calendar-commands.c
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 672d8fc809..8c0149cff6 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -1288,11 +1288,32 @@ add_instance_cb (ECalComponent *comp, time_t instance_start, time_t instance_end
 	ECalModelComponent *comp_data;
 	ECalModelPrivate *priv;
 	RecurrenceExpansionData *rdata = user_data;
+	icaltimetype time;
+	ECalComponentDateTime datetime, to_set;
+	icaltimezone *zone = NULL;
+
+	g_return_val_if_fail (E_IS_CAL_COMPONENT (comp), TRUE);
 
 	priv = rdata->model->priv;
 
 	e_table_model_pre_change (E_TABLE_MODEL (rdata->model));
 
+	/* set the right instance start date to component */
+	e_cal_component_get_dtstart (comp, &datetime);
+	e_cal_get_timezone (rdata->client, datetime.tzid, &zone, NULL);
+	time = icaltime_from_timet_with_zone (instance_start, FALSE, zone ? zone : priv->zone);
+	to_set.value = &time;
+	to_set.tzid = datetime.tzid; 
+	e_cal_component_set_dtstart (comp, &to_set);
+	
+	/* set the right instance end date to component*/
+	e_cal_component_get_dtend (comp, &datetime);
+	e_cal_get_timezone (rdata->client, datetime.tzid, &zone, NULL);
+	time = icaltime_from_timet_with_zone (instance_end, FALSE, zone ? zone : priv->zone);
+	to_set.value = &time;
+	to_set.tzid = datetime.tzid; 
+	e_cal_component_set_dtend (comp, &to_set);
+
 	comp_data = g_new0 (ECalModelComponent, 1);
 	comp_data->client = g_object_ref (rdata->client);
 	comp_data->icalcomp = icalcomponent_new_clone (e_cal_component_get_icalcomponent (comp));
@@ -1356,8 +1377,8 @@ e_cal_view_objects_added_cb (ECalView *query, GList *objects, gpointer user_data
 			pos = get_position_in_array (priv->objects, comp_data);
 			e_table_model_row_deleted (E_TABLE_MODEL (model), pos);
 
- 			g_ptr_array_remove (priv->objects, comp_data);
- 			e_cal_model_free_component_data (comp_data);
+ 			if (g_ptr_array_remove (priv->objects, comp_data))
+	 			e_cal_model_free_component_data (comp_data);
  		}
 
 		e_cal_component_free_id (id);
@@ -1412,7 +1433,7 @@ e_cal_view_objects_removed_cb (ECalView *query, GList *ids, gpointer user_data)
 	GList *l;
 	
 	priv = model->priv;
-
+	
 	for (l = ids; l; l = l->next) {
 		ECalModelComponent *comp_data = NULL;
 		ECalComponentId *id = l->data;
@@ -1425,8 +1446,8 @@ e_cal_view_objects_removed_cb (ECalView *query, GList *ids, gpointer user_data)
 			pos = get_position_in_array (priv->objects, comp_data);
 			e_table_model_row_deleted (E_TABLE_MODEL (model), pos);
 
-			g_ptr_array_remove (priv->objects, comp_data);
-			e_cal_model_free_component_data (comp_data);
+			if (g_ptr_array_remove (priv->objects, comp_data))
+				e_cal_model_free_component_data (comp_data);
 		}
 	}
 }