if we don't have a RECURRENCE-ID, remove nothing, and use the instance

2004-05-17  Rodrigo Moya <rodrigo@ximian.com>

	* gui/e-calendar-view.c (e_calendar_view_delete_selected_occurrence):
	if we don't have a RECURRENCE-ID, remove nothing, and use the instance
	start time for the RECURRENCE-ID as the default.

svn path=/trunk/; revision=25925

1 files changed, 2 insertions, 6 deletions

diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 0ea8b5b2e4..9a752bc910 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -871,7 +871,7 @@ e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view)
 {
 	ECalendarViewEvent *event;
 	GList *selected;
-	const char *uid, *rid;
+	const char *uid, *rid = NULL;
 	GError *error = NULL;
 	ECalComponent *comp;
 		
@@ -889,14 +889,10 @@ e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view)
 	else {
 		ECalComponentDateTime dt;
 
-		/* get the RECUR-ID from the start date */
 		e_cal_component_get_dtstart (comp, &dt);
 		if (dt.value) {
-			rid = icaltime_as_ical_string (*dt.value);
+			rid = icaltime_as_ical_string (icaltime_from_timet (event->start, dt.value->is_date));
 			e_cal_component_free_datetime (&dt);
-		} else {
-			g_object_unref (comp);
-			return;
 		}
 	}