From 39dc8f4fc8a9e459689ee61a197270d8e23e68de Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Fri, 24 Nov 2000 20:41:01 +0000 Subject: Use the new libical external iterators (icalcomponent_begin_component() 2000-11-24 Federico Mena Quintero * pcs/cal-backend-file.c (scan_vcalendar): Use the new libical external iterators (icalcomponent_begin_component() and friends); the internal iterators are deprecated. * cal-util/test-recur.c (generate_occurrences): Likewise. * gui/e-itip-control.c (pstream_load): Likewise. * gui/e-meeting-edit.c (e_meeting_edit): Likewise. * pcs/cal-backend.c (cal_backend_log_entry): Plug leak. (cal_backend_log_sync): Free the entry->uid. * util/icalendar-save.[ch]: * util/icalendar-test.c: * util/icalendar.[ch]: Removed obsolete files. svn path=/trunk/; revision=6660 --- calendar/pcs/cal-backend-file.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'calendar/pcs/cal-backend-file.c') 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 -- cgit v1.2.3