Fixes #271679

2005-05-06  Rodrigo Moya <rodrigo@novell.com>

	Fixes #271679

	* gui/dialogs/comp-editor.c (save_comp):
	* gui/e-week-view.c (e_week_view_on_editing_stopped,
	e_week_view_change_event_time): set correct start/end times for
	individual instances and remove all rules and exceptions.
	(e_week_view_reshape_event_span): show recurrence icons for
	detached instances also.

	* gui/e-day-view.c (e_day_view_finish_resize,
	e_day_view_finish_long_event_resize, e_day_view_on_editing_stopped,
	e_day_view_on_top_canvas_drag_data_received,
	e_day_view_on_main_canvas_drag_data_received,
	e_day_view_change_event_time): set the correct start/end times when
	modifying individual instances and remove all rules and exceptions.
	(e_day_view_on_top_canvas_motion, e_day_view_on_main_canvas_motion):
	disable D&D for recurring events.
	(e_day_view_reshape_long_event, e_day_view_reshape_day_event):
	check for detached instances and show recurrence icons for them also.

	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):
	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
	check for detached instances and show recurrence icons for them also.

	* gui/e-cal-model.c (set_instance_times): don't use the RECURRENCE-ID
	to get the datetime.

	* gui/e-calendar-view.c (e_calendar_view_delete_selected_occurrence):
	exceptions need to be date only.
	(e_calendar_view_copy_clipboard): remove RECURRENCE-IDs from components
	we copy to the clipboard.
	(e_calendar_view_cut_clipboard): when cutting instances, remove only
	the selected instances.
	(on_unrecur_appointment): use MOD_ALL to modify the master object and
	remove recurrence-id from detached event.

	* gui/dialogs/recur-comp.c (recur_component_dialog): re-enabled.

svn path=/trunk/; revision=29276

1 files changed, 10 insertions, 15 deletions

diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index ca0f16a4ba..872ace383d 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -1301,12 +1301,7 @@ set_instance_times (ECalModelComponent *comp_data, icaltimezone *zone)
 	start_time = icalcomponent_get_dtstart (comp_data->icalcomp);
 	end_time = icalcomponent_get_dtend (comp_data->icalcomp);
 
-	if (e_cal_util_component_is_instance (comp_data->icalcomp)) {
-		itt = icaltime_convert_to_zone (recur_time, icaltimezone_get_utc_timezone ());
-		comp_data->instance_start = icaltime_as_timet (itt);
-	} else {
-		comp_data->instance_start = icaltime_as_timet (start_time);
-	}
+	comp_data->instance_start = icaltime_as_timet (start_time);
 
 	comp_data->instance_end = comp_data->instance_start +
 		(icaltime_as_timet (end_time) - icaltime_as_timet (start_time));
@@ -1324,17 +1319,17 @@ e_cal_view_objects_added_cb (ECalView *query, GList *objects, gpointer user_data
 	for (l = objects; l; l = l->next) {
 		ECalModelComponent *comp_data;
 
-		/* remove the components if they are already present and re-add them */
-		while ((comp_data = search_by_uid_and_client (priv, e_cal_view_get_client (query),
-							      icalcomponent_get_uid (l->data)))) {
-			int pos;
+/* 		/\* remove the components if they are already present and re-add them *\/ */
+/* 		while ((comp_data = search_by_uid_and_client (priv, e_cal_view_get_client (query), */
+/* 							      icalcomponent_get_uid (l->data)))) { */
+/* 			int pos; */
 
-			pos = get_position_in_array (priv->objects, comp_data);
-			e_table_model_row_deleted (E_TABLE_MODEL (model), pos);
+/* 			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);
-		}
+/*  			g_ptr_array_remove (priv->objects, comp_data); */
+/*  			e_cal_model_free_component_data (comp_data); */
+/*  		} */
 
 		if ((priv->flags & E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES)) {
 			RecurrenceExpansionData rdata;