diff options
| author | Chenthill Palanisamy <pchen@src.gnome.org> | 2005-08-05 01:19:06 +0800 |
|---|---|---|
| committer | Chenthill Palanisamy <pchen@src.gnome.org> | 2005-08-05 01:19:06 +0800 |
| commit | 6e1736752fa8beb8d9608e448e1d82d41d18a924 (patch) | |
| tree | 785759a7f53bead6961a376cfd358c95b1b9ac4c /calendar | |
| parent | 4d0deec6c8b04ffe81a18961bb308f0374057825 (diff) | |
| download | gsoc2013-evolution-6e1736752fa8beb8d9608e448e1d82d41d18a924.tar gsoc2013-evolution-6e1736752fa8beb8d9608e448e1d82d41d18a924.tar.gz gsoc2013-evolution-6e1736752fa8beb8d9608e448e1d82d41d18a924.tar.bz2 gsoc2013-evolution-6e1736752fa8beb8d9608e448e1d82d41d18a924.tar.lz gsoc2013-evolution-6e1736752fa8beb8d9608e448e1d82d41d18a924.tar.xz gsoc2013-evolution-6e1736752fa8beb8d9608e448e1d82d41d18a924.tar.zst gsoc2013-evolution-6e1736752fa8beb8d9608e448e1d82d41d18a924.zip | |
Fixes #302460
svn path=/trunk/; revision=29994
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 14 | ||||
| -rw-r--r-- | calendar/gui/e-day-view.c | 15 |
2 files changed, 24 insertions, 5 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 110393914e..5fe4a724c8 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,17 @@ +2005-08-05 Viren.l <lviren@novell.com> + + Fixes #302460 + * gui/e-day-view.c (e_day_view_on_event_double_click): + use icalcomponent_get_current_property and invoke + e_calendar_view_edit_appointment with appropriate + parameters. + +2005-08-05 Chenthill Palanisamy <pchenthill@novell.com> + + Fixes #312460 + * gui/itip-utils.c (itip_get_comp_attendee): Removed + a double free. + 2005-08-03 Harry Lu <harry.lu@sun.com> Fix for #312447. diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 29ebe0d99b..caaf1ae6a9 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -3306,13 +3306,18 @@ e_day_view_on_event_double_click (EDayView *day_view, event = &g_array_index (day_view->events[day], EDayViewEvent, event_num); - e_day_view_stop_editing_event (day_view); - - - attendee_prop = icalcomponent_get_first_property (event->comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY); - e_calendar_view_edit_appointment (E_CALENDAR_VIEW (day_view), + if (day == day_view->editing_event_day + && event_num == day_view->editing_event_num + && icalcomponent_get_current_property (event->comp_data->icalcomp)) { + attendee_prop = icalcomponent_get_first_property (event->comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY) +; + e_calendar_view_edit_appointment (day_view, event->comp_data->client, event->comp_data->icalcomp, attendee_prop ? TRUE:FALSE); + } else + e_calendar_view_edit_appointment (day_view, + event->comp_data->client, + event->comp_data->icalcomp, FALSE); } static void |