aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/e-cal-model.c7
2 files changed, 13 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 98623349cd..3d4a9019a5 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-22 Chenthill Palanisamy <pchenthill@novell.com>
+
+ Fixes #330842
+ * gui/e-cal-model.c:
+ (e_cal_view_objects_added_cb): Check if the icalcomp
+ is set to ECalComponent.
+
2006-03-22 Harry Lu <harry.lu@sun.com>
Fix for 333697
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 3ef8ba6e47..6d5d5ea0b1 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -1359,7 +1359,12 @@ e_cal_view_objects_added_cb (ECalView *query, GList *objects, gpointer user_data
ECalComponent *comp = e_cal_component_new ();
ECal *client = e_cal_view_get_client (query);
- e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (l->data));
+ /* This will fail for alarm or VCalendar component */
+ if (!e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (l->data))) {
+ g_object_unref (comp);
+ continue;
+ }
+
id = e_cal_component_get_id (comp);
/* remove the components if they are already present and re-add them */