From c3a9a32b59ef4fb590e8a2232177630891b46b71 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Mon, 27 Sep 2004 14:14:11 +0000 Subject: Fixes #65599 2004-09-24 Rodrigo Moya Fixes #65599 * gui/itip-utils.c (comp_fb_normalize): don't use NULL properties. * gui/e-pub-utils.c (e_pub_publish): use auth_new_cal_from_source() instead of auth_new_cal_from_uri(). svn path=/trunk/; revision=27394 --- calendar/ChangeLog | 9 +++++++++ calendar/gui/e-pub-utils.c | 2 +- calendar/gui/itip-utils.c | 12 ++++++++---- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 5816c90ad4..54f9f359a3 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,12 @@ +2004-09-24 Rodrigo Moya + + Fixes #65599 + + * gui/itip-utils.c (comp_fb_normalize): don't use NULL properties. + + * gui/e-pub-utils.c (e_pub_publish): use auth_new_cal_from_source() + instead of auth_new_cal_from_uri(). + 2004-09-24 JP Rosevear Fixes #66344 diff --git a/calendar/gui/e-pub-utils.c b/calendar/gui/e-pub-utils.c index 456f695528..235ce8d159 100644 --- a/calendar/gui/e-pub-utils.c +++ b/calendar/gui/e-pub-utils.c @@ -263,7 +263,7 @@ e_pub_publish (gboolean publish) { source_uid = g_strdup (p->data); source = e_source_list_peek_source_by_uid (source_list, source_uid); if (source) - client = auth_new_cal_from_uri (e_source_get_uri (source), E_CAL_SOURCE_TYPE_EVENT); + client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_EVENT); if (!client) { g_warning (G_STRLOC ": Could not publish Free/Busy: Calendar backend no longer exists"); diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index d78d2994b6..cf59acf460 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -1057,8 +1057,10 @@ comp_fb_normalize (icalcomponent *icomp) prop = icalcomponent_get_first_property (icomp, ICAL_ORGANIZER_PROPERTY); - p = icalproperty_new_clone (prop); - icalcomponent_add_property (iclone, p); + if (prop) { + p = icalproperty_new_clone (prop); + icalcomponent_add_property (iclone, p); + } itt = icalcomponent_get_dtstart (icomp); icalcomponent_set_dtstart (iclone, itt); @@ -1103,8 +1105,10 @@ comp_fb_normalize (icalcomponent *icomp) icalcomponent_set_dtstamp (iclone, itt); prop = icalcomponent_get_first_property (icomp, ICAL_URL_PROPERTY); - p = icalproperty_new_clone (prop); - icalcomponent_add_property (iclone, p); + if (prop) { + p = icalproperty_new_clone (prop); + icalcomponent_add_property (iclone, p); + } comment = icalcomponent_get_comment (icomp); if (comment) -- cgit