From d119772345dd43d0dda4290e28dde319a1d55cd6 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Thu, 24 Mar 2005 15:38:39 +0000 Subject: Fixes #69272 2005-03-24 JP Rosevear Fixes #69272 * gui/comp-util.c (cal_comp_event_new_with_defaults): ensure we always return a valid comp * gui/comp-util.c (cal_comp_task_new_with_defaults): ditto; fix obvious pasto that would cause a leak svn path=/trunk/; revision=29107 --- calendar/gui/comp-util.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'calendar/gui/comp-util.c') diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c index 0ee3e696bb..2be56453c1 100644 --- a/calendar/gui/comp-util.c +++ b/calendar/gui/comp-util.c @@ -256,13 +256,13 @@ cal_comp_event_new_with_defaults (ECal *client) ECalComponentAlarmTrigger trigger; if (!e_cal_get_default_object (client, &icalcomp, NULL)) - return NULL; + icalcomp = icalcomponent_new (ICAL_VEVENT_COMPONENT); comp = e_cal_component_new (); if (!e_cal_component_set_icalcomponent (comp, icalcomp)) { - g_object_unref (comp); icalcomponent_free (icalcomp); - return NULL; + + e_cal_component_set_new_vtype (comp, E_CAL_COMPONENT_EVENT); } if (!calendar_config_get_use_default_reminder ()) @@ -358,21 +358,13 @@ cal_comp_task_new_with_defaults (ECal *client) icalcomponent *icalcomp; if (!e_cal_get_default_object (client, &icalcomp, NULL)) - return NULL; - + icalcomp = icalcomponent_new (ICAL_VTODO_COMPONENT); + comp = e_cal_component_new (); if (!e_cal_component_set_icalcomponent (comp, icalcomp)) { - g_object_unref (comp); icalcomponent_free (icalcomp); - return NULL; - } - - comp = e_cal_component_new (); - if (!e_cal_component_set_icalcomponent (comp, icalcomp)) { - g_object_unref (comp); - icalcomponent_free (icalcomp); - return NULL; + e_cal_component_set_new_vtype (comp, E_CAL_COMPONENT_TODO); } return comp; -- cgit v1.2.3