don't set the ico->uid to NULL or we won't find any other occurrences of

2000-05-08  Damon Chaplin  <damon@helixcode.com>

        * 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

1 files changed, 5 insertions, 4 deletions

diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 3e5054b9f7..43db86972f 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -1298,10 +1298,11 @@ e_day_view_remove_event_cb (EDayView *day_view,
 		event = &g_array_index (day_view->events[day],
 					EDayViewEvent, 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 (day_view->editing_event_day == day
+	    && day_view->editing_event_num == event_num)
+		day_view->editing_event_day = -1;
 
 	if (event->canvas_item)
 		gtk_object_destroy (GTK_OBJECT (event->canvas_item));