Fixes #57622

2004-07-30  Rodrigo Moya <rodrigo@novell.com>

	Fixes #57622

	* gui/e-cal-model.h: added ECalModelFlags enum type.

	* gui/e-cal-model.c (e_cal_model_set_flags, e_cal_model_get_flags):
	new functions.
	(e_cal_model_init): initialize the new internal field to keep the flags.
	(e_cal_view_objects_added_cb): expand recurrences if the model flags
	contain the EXPAND_RECUR bit.
	(e_cal_view_objects_modified_cb): if EXPAND_RECUR is on, remove all
	recurrences and regenerate them.
	(e_cal_view_objects_removed_cb): remove all instances for given UIDs.
	(add_new_client): killed warning.
	(get_dtstart): use the instance_start time when dealing with recurrences.

	* gui/e-cal-model-calendar.c (get_dtend): use the instance_end time
	when dealing with recurrences.

	* gui/e-cal-list-view.c (e_cal_list_view_new): set the EXPAND_RECUR
	flag on the model for the list view.

	* gui/e-week-view.c (e_week_view_add_event):
	* gui/e-day-view.c (e_day_view_add_event): fill in the instance's
	start and end times in the ECalModelComponent struct.

	* gui/e-calendar-view.c (e_calendar_view_delete_selected_occurrence):
	use the instance_start field to retrieve the RECUR-ID, now that all the
	views fill it in.

svn path=/trunk/; revision=26790

1 files changed, 6 insertions, 10 deletions

diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index e95bc458ff..0cb5cb9f3d 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -910,17 +910,13 @@ e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view)
 			return;
 		}
 
-		/* get the RECUR-ID from the start date */
+		/* get the RECUR-ID from the instance start date */
 		e_cal_component_get_dtstart (comp, &dt);
-		if (dt.value) {
-			if (e_cal_get_timezone (event->comp_data->client, dt.tzid, &zone, NULL)) {
-				rid = icaltime_as_ical_string (
-					icaltime_from_timet_with_zone (event->start, TRUE, zone));
-			} else {
-				rid = icaltime_as_ical_string (
-					icaltime_from_timet (event->start, TRUE));
-			}
-		}
+		if (e_cal_get_timezone (event->comp_data->client, dt.tzid, &zone, NULL)) {
+			rid = icaltime_as_ical_string (
+				icaltime_from_timet_with_zone (event->comp_data->instance_start, TRUE, zone));
+		} else
+			rid = icaltime_as_ical_string (icaltime_from_timet (event->comp_data->instance_start, TRUE));
 
 		e_cal_component_free_datetime (&dt);
 	}