aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/gui/e-cal-model.c3
2 files changed, 9 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index ba87434689..d77a0f4154 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-22 Rodrigo Moya <rodrigo@ximian.com>
+
+ * gui/e-cal-model.c (e_cal_view_objects_removed_cb): don't assert
+ if we can't find the component, just continue with next item in
+ the list.
+
2004-01-22 JP Rosevear <jpr@ximian.com>
* gui/e-tasks.c (e_tasks_setup_view_menus): Remove debugging
@@ -14,7 +20,7 @@
base dir for the view storage
Fixes #53133
-
+
2004-01-21 Rodrigo Moya <rodrigo@ximian.com>
* gui/e-tasks.c (e_tasks_add_todo_source): check return value
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index cb463deb21..26283e3b32 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -1215,7 +1215,8 @@ e_cal_view_objects_removed_cb (ECalView *query, GList *uids, gpointer user_data)
e_table_model_pre_change (E_TABLE_MODEL (model));
comp_data = search_by_uid_and_client (priv, e_cal_view_get_client (query), l->data);
- g_assert (comp_data);
+ if (!comp_data)
+ continue;
pos = get_position_in_array (priv->objects, comp_data);