aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@src.gnome.org>2007-08-23 17:18:07 +0800
committerMilan Crha <mcrha@src.gnome.org>2007-08-23 17:18:07 +0800
commitc08bea18589e973da6c4f8e8d3ff3c840001e8b7 (patch)
treed7d639d08b35722ce40c573f1ebc4989f8f1602f
parent71b50d249c33e7008fd96f789a7de2c0f8879213 (diff)
downloadgsoc2013-evolution-c08bea18589e973da6c4f8e8d3ff3c840001e8b7.tar.gz
gsoc2013-evolution-c08bea18589e973da6c4f8e8d3ff3c840001e8b7.tar.zst
gsoc2013-evolution-c08bea18589e973da6c4f8e8d3ff3c840001e8b7.zip
2007-08-23 mcrha Fix for bug #355864
svn path=/trunk/; revision=34070
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/e-week-view.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 30a25f7c37..ce4db1d611 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,12 @@
2007-08-23 Milan Crha <mcrha@redhat.com>
+ ** Fix for bug #355864
+
+ * gui/e-week-view.c: (e_week_view_remove_event_cb):
+ Better remove array item after done with it, not before.
+
+2007-08-23 Milan Crha <mcrha@redhat.com>
+
** Fix for bug #272167
* gui/e-cal-popup.c: (e_cal_popup_target_new_source):
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index b2a8ccad2f..97e08fe840 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -1920,8 +1920,6 @@ e_week_view_remove_event_cb (EWeekView *week_view,
e_cal_model_free_component_data (event->comp_data);
event->comp_data = NULL;
- g_array_remove_index (week_view->events, event_num);
-
/* 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++) {
@@ -1938,6 +1936,8 @@ e_week_view_remove_event_cb (EWeekView *week_view,
}
}
+ g_array_remove_index (week_view->events, event_num);
+
week_view->events_need_layout = TRUE;
return TRUE;