diff options
| author | Chenthill Palanisamy <pchenthill@novell.com> | 2005-07-20 20:22:24 +0800 |
|---|---|---|
| committer | Chenthill Palanisamy <pchen@src.gnome.org> | 2005-07-20 20:22:24 +0800 |
| commit | 53ef30545571eec7633f20adf60476b06c8da77c (patch) | |
| tree | ec604a1702137b4af48e686c23e718207228cbb2 | |
| parent | 7b0b66588bd9cc64ff0149c6743f35d5a6555698 (diff) | |
| download | gsoc2013-evolution-53ef30545571eec7633f20adf60476b06c8da77c.tar gsoc2013-evolution-53ef30545571eec7633f20adf60476b06c8da77c.tar.gz gsoc2013-evolution-53ef30545571eec7633f20adf60476b06c8da77c.tar.bz2 gsoc2013-evolution-53ef30545571eec7633f20adf60476b06c8da77c.tar.lz gsoc2013-evolution-53ef30545571eec7633f20adf60476b06c8da77c.tar.xz gsoc2013-evolution-53ef30545571eec7633f20adf60476b06c8da77c.tar.zst gsoc2013-evolution-53ef30545571eec7633f20adf60476b06c8da77c.zip | |
Fixes #310340 Check if the backend supports having master object for
2005-07-20 Chenthill Palanisamy <pchenthill@novell.com>
Fixes #310340
* gui/e-calendar-view.c
(e_calendar_view_delete_selected_occurrence): Check if the
backend supports having master object for recurrences and set
the recurrence id accordingly.
svn path=/trunk/; revision=29816
| -rw-r--r-- | calendar/ChangeLog | 10 | ||||
| -rw-r--r-- | calendar/gui/e-calendar-view.c | 15 |
2 files changed, 18 insertions, 7 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index a2b5d96988..5f2d8b7220 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2005-07-20 Chenthill Palanisamy <pchenthill@novell.com> + + Fixes #310340 + * gui/e-calendar-view.c: + (e_calendar_view_delete_selected_occurrence): Check if the + backend supports having master object for recurrences and set + the recurrence id accordingly. + 2005-07-20 Srinivasa Ragavan <sragavan@novell.com> * gui/dialogs/comp-editor.c: (get_attachment_list) (comp_editor_get_mime_attach_list) @@ -25,7 +33,7 @@ 2005-07-12 Srinivasa Ragavan <sragavan@novell.com> * gui/dialogs/comp-editor.c: (get_attachment_list) (attachment_guess_mime_type) - (comp_editor_close) (comp_editor_get_mime_attach_list) Fixed some compiler + (comp_editor_close) (comp_editor_get_mime_attach_list): Fixed some compiler warning and checked some negative cases 2005-07-11 Srinivasa Ragavan <sragavan@novell.com> diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index a02c91e6b5..9b7c75a874 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -938,11 +938,14 @@ e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view) e_cal_component_get_dtstart (comp, &dt); e_cal_get_timezone (event->comp_data->client, dt.tzid, &zone, NULL); - if (zone) - itt = icaltime_from_timet_with_zone (event->comp_data->instance_start, TRUE, zone); - else - itt = icaltime_from_timet (event->comp_data->instance_start, TRUE); - rid = icaltime_as_ical_string (itt); + if (!e_cal_get_recurrences_no_master (event->comp_data->client)) { + if (zone) + itt = icaltime_from_timet_with_zone (event->comp_data->instance_start, TRUE, zone); + else + itt = icaltime_from_timet (event->comp_data->instance_start, TRUE); + rid = icaltime_as_ical_string (itt); + } else + rid = e_cal_component_get_recurid_as_string (comp); e_cal_component_free_datetime (&dt); @@ -952,7 +955,7 @@ e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view) if (itip_organizer_is_user (comp, event->comp_data->client) && cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (cal_view)), event->comp_data->client, - comp, TRUE)) { + comp, TRUE) && !e_cal_get_save_schedules (event->comp_data->client)) { if (!e_cal_component_is_instance (comp)) { ECalComponentRange range; |