aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/pcs
diff options
context:
space:
mode:
Diffstat (limited to 'calendar/pcs')
-rw-r--r--calendar/pcs/cal-backend-file.c11
-rw-r--r--calendar/pcs/cal-backend.c3
2 files changed, 9 insertions, 5 deletions
diff --git a/calendar/pcs/cal-backend-file.c b/calendar/pcs/cal-backend-file.c
index 715e1e70bc..c63e690246 100644
--- a/calendar/pcs/cal-backend-file.c
+++ b/calendar/pcs/cal-backend-file.c
@@ -550,18 +550,21 @@ static void
scan_vcalendar (CalBackendFile *cbfile)
{
CalBackendFilePrivate *priv;
- icalcomponent *icalcomp;
+ icalcompiter iter;
priv = cbfile->priv;
g_assert (priv->icalcomp != NULL);
g_assert (priv->comp_uid_hash != NULL);
- for (icalcomp = icalcomponent_get_first_component (priv->icalcomp, ICAL_ANY_COMPONENT);
- icalcomp;
- icalcomp = icalcomponent_get_next_component (priv->icalcomp, ICAL_ANY_COMPONENT)) {
+ for (iter = icalcomponent_begin_component (priv->icalcomp, ICAL_ANY_COMPONENT);
+ icalcompiter_deref (&iter) != NULL;
+ icalcompiter_next (&iter)) {
+ icalcomponent *icalcomp;
icalcomponent_kind kind;
CalComponent *comp;
+ icalcomp = icalcompiter_deref (&iter);
+
kind = icalcomponent_isa (icalcomp);
if (!(kind == ICAL_VEVENT_COMPONENT
diff --git a/calendar/pcs/cal-backend.c b/calendar/pcs/cal-backend.c
index b2b16b2c9e..f4d06518c1 100644
--- a/calendar/pcs/cal-backend.c
+++ b/calendar/pcs/cal-backend.c
@@ -479,7 +479,7 @@ cal_backend_log_entry (CalBackend *backend,
CalObjType cot,
CalBackendLogEntryType type)
{
- CalBackendLogEntry *entry = g_new0 (CalBackendLogEntry, 1);
+ CalBackendLogEntry *entry;
g_assert (CLASS (backend)->get_type_by_uid != NULL);
@@ -565,6 +565,7 @@ cal_backend_log_sync (CalBackend *backend)
|| entry->time_stamp > end_time)
end_time = entry->time_stamp;
+ g_free (entry->uid);
g_free (entry);
}
cal_backend_set_node_timet (tnode, "start", start_time);