aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@ximian.com>2004-05-17 23:10:43 +0800
committerRodrigo Moya <rodrigo@src.gnome.org>2004-05-17 23:10:43 +0800
commitfbcda31bfd17096361fb4c619486c15bfc260ad0 (patch)
tree046f1ba67c0d09ee77cdc43a21d9868f626766f8
parenta54c54fd76f48ee3d73ca8e246439321a8d11a51 (diff)
downloadgsoc2013-evolution-fbcda31bfd17096361fb4c619486c15bfc260ad0.tar
gsoc2013-evolution-fbcda31bfd17096361fb4c619486c15bfc260ad0.tar.gz
gsoc2013-evolution-fbcda31bfd17096361fb4c619486c15bfc260ad0.tar.bz2
gsoc2013-evolution-fbcda31bfd17096361fb4c619486c15bfc260ad0.tar.lz
gsoc2013-evolution-fbcda31bfd17096361fb4c619486c15bfc260ad0.tar.xz
gsoc2013-evolution-fbcda31bfd17096361fb4c619486c15bfc260ad0.tar.zst
gsoc2013-evolution-fbcda31bfd17096361fb4c619486c15bfc260ad0.zip
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
-rw-r--r--calendar/ChangeLog3
-rw-r--r--calendar/gui/e-calendar-view.c8
2 files changed, 4 insertions, 7 deletions
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 <rodrigo@ximian.com>
* 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 <hpnadig@pacific.net.in>
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;
}
}