From c2dde9ab64a79b483804cddbd9622827b4b2baf2 Mon Sep 17 00:00:00 2001 From: Damon Chaplin Date: Mon, 8 May 2000 16:37:31 +0000 Subject: don't set the ico->uid to NULL or we won't find any other occurrences of 2000-05-08 Damon Chaplin * gui/e-week-view.c (e_week_view_remove_event_cb): * gui/e-day-view.c (e_day_view_remove_event_cb): don't set the ico->uid to NULL or we won't find any other occurrences of the event. Set the editing_event_day/num to -1 instead. * gui/e-week-view-event-item.c (e_week_view_event_item_draw): fixed the positioning of the icons for long events. * cal-util/calobj.c (ical_object_normalize_summary): forgot to terminate the string. svn path=/trunk/; revision=2920 --- calendar/gui/e-week-view.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'calendar/gui/e-week-view.c') diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 6b75b409ba..0665a6e63d 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -1136,11 +1136,11 @@ e_week_view_remove_event_cb (EWeekView *week_view, event = &g_array_index (week_view->events, EWeekViewEvent, event_num); - /* We set the event's uid to NULL so we don't try to update it in - on_editing_stopped(). */ - g_free (event->ico->uid); - event->ico->uid = NULL; - + /* If we were editing this event, set editing_event_num to -1 so + on_editing_stopped doesn't try to update the event. */ + if (week_view->editing_event_num == event_num) + week_view->editing_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++) { -- cgit v1.2.3