aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
Diffstat (limited to 'calendar/gui')
-rw-r--r--calendar/gui/e-pub-utils.c2
-rw-r--r--calendar/gui/itip-utils.c12
2 files changed, 9 insertions, 5 deletions
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)