diff options
| author | Chenthill Palanisamy <pchen@src.gnome.org> | 2005-10-11 17:07:24 +0800 |
|---|---|---|
| committer | Chenthill Palanisamy <pchen@src.gnome.org> | 2005-10-11 17:07:24 +0800 |
| commit | 25317085c402d37406b4ecbd4a13289a09c9385e (patch) | |
| tree | 5a81db73505858bee8d1bc1656bec2238dd71851 /calendar/gui/e-calendar-view.c | |
| parent | 08e459d65f1d1895bf6d6d8dad15bec33b733550 (diff) | |
| download | gsoc2013-evolution-25317085c402d37406b4ecbd4a13289a09c9385e.tar.gz gsoc2013-evolution-25317085c402d37406b4ecbd4a13289a09c9385e.tar.zst gsoc2013-evolution-25317085c402d37406b4ecbd4a13289a09c9385e.zip | |
fixes #266144, #317575.
svn path=/trunk/; revision=30503
Diffstat (limited to 'calendar/gui/e-calendar-view.c')
| -rw-r--r-- | calendar/gui/e-calendar-view.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index efb3c580db..81420ceb14 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -863,7 +863,10 @@ delete_event (ECalendarView *cal_view, ECalendarViewEvent *event) comp = e_cal_component_new (); e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp)); vtype = e_cal_component_get_vtype (comp); - e_cal_component_set_recurid (comp, NULL); + + /*FIXME remove it once the we dont set the recurrence id for all the generated instances */ + if (!e_cal_get_static_capability (event->comp_data->client, CAL_STATIC_CAPABILITY_RECURRENCES_NO_MASTER)) + e_cal_component_set_recurid (comp, NULL); if (delete_component_dialog (comp, FALSE, 1, vtype, GTK_WIDGET (cal_view))) { const char *uid; @@ -882,8 +885,9 @@ delete_event (ECalendarView *cal_view, ECalendarViewEvent *event) return; } - if (e_cal_util_component_is_instance (event->comp_data->icalcomp) || e_cal_util_component_is_instance (event->comp_data->icalcomp)) - e_cal_remove_object_with_mod (event->comp_data->client, uid, NULL, CALOBJ_MOD_ALL, &error); + if (e_cal_util_component_is_instance (event->comp_data->icalcomp) || e_cal_util_component_has_recurrences (event->comp_data->icalcomp)) + e_cal_remove_object_with_mod (event->comp_data->client, uid, + e_cal_component_get_recurid_as_string (comp), CALOBJ_MOD_ALL, &error); else e_cal_remove_object (event->comp_data->client, uid, &error); |