aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/e-day-view.c21
2 files changed, 13 insertions, 14 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 5c5211afad..c3b8c81e06 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,11 @@
2005-08-12 Viren.L <lviren@novell.com>
+ Fixes #312739
+ * gui/e-day-view.c: (e_day_view_on_event_double_click):
+ Removed the checks for event_num, editing_event_day and ical_component_get_current_property.
+
+2005-08-12 Viren.L <lviren@novell.com>
+
Fixes #310338
* gui/alarm-notify-dialog.c:(notified_alarms_dialog_new),
(edit_pressed_cb),(snooze_pressed_cb),(dialog_response_cb):
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index caaf1ae6a9..5a2b806119 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -3301,23 +3301,16 @@ e_day_view_on_event_double_click (EDayView *day_view,
if (day == -1)
event = &g_array_index (day_view->long_events, EDayViewEvent,
- event_num);
+ event_num);
else
event = &g_array_index (day_view->events[day], EDayViewEvent,
- event_num);
+ event_num);
+
+ attendee_prop = icalcomponent_get_first_property (event->comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY);
- 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);
+ e_calendar_view_edit_appointment (day_view,
+ event->comp_data->client,
+ event->comp_data->icalcomp, attendee_prop ? TRUE:FALSE);
}
static void