From fbcda31bfd17096361fb4c619486c15bfc260ad0 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Mon, 17 May 2004 15:10:43 +0000 Subject: if we don't have a RECURRENCE-ID, remove nothing, and use the instance 2004-05-17 Rodrigo Moya * 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 --- calendar/ChangeLog | 3 ++- calendar/gui/e-calendar-view.c | 8 ++------ 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'calendar') diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 66fcd848bc..90518b6ba5 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,7 +1,8 @@ 2004-05-17 Rodrigo Moya * gui/e-calendar-view.c (e_calendar_view_delete_selected_occurrence): - if we don't have a RECURRENCE-ID, remove nothing. + if we don't have a RECURRENCE-ID, remove nothing, and use the instance + start time for the RECURRENCE-ID as the default. 2004-05-17 H P Nadig 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; } } -- cgit v1.2.3