diff options
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/gui/e-day-view.c | 10 | ||||
| -rw-r--r-- | calendar/gui/e-week-view.c | 3 |
3 files changed, 19 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 51f24612e5..c5407bcbf1 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2005-02-04 Rodrigo Moya <rodrigo@novell.com> + + Fixes #71265 + + * gui/e-week-view.c (e_week_view_remove_event_cb): + * gui/e-day-view.c (e_day_view_remove_event_cb): if we remove the + event we were editing, update internal pointers. + 2005-02-04 Vivek Jain <jvivek@novell.com> * calendar-errors.xml.h diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 485a930f89..73b57432cf 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -1722,9 +1722,15 @@ e_day_view_remove_event_cb (EDayView *day_view, /* If we were editing this event, set editing_event_day to -1 so on_editing_stopped doesn't try to update the event. */ - if (day_view->editing_event_day == day - && day_view->editing_event_num == event_num) + if (day_view->editing_event_num == event_num && day_view->editing_event_day == day) { + day_view->editing_event_num = -1; day_view->editing_event_day = -1; + } + + if (day_view->popup_event_num == event_num && day_view->popup_event_day == day) { + day_view->popup_event_num = -1; + day_view->popup_event_day = -1; + } if (event->canvas_item) gtk_object_destroy (GTK_OBJECT (event->canvas_item)); diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index d829675624..684d278d84 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -1913,6 +1913,9 @@ e_week_view_remove_event_cb (EWeekView *week_view, if (week_view->editing_event_num == event_num) week_view->editing_event_num = -1; + if (week_view->popup_event_num == event_num) + week_view->popup_event_num = -1; + /* We leave the span elements in the array, but set the canvas item pointers to NULL. */ for (span_num = 0; span_num < event->num_spans; span_num++) { |