aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@helixcode.com>2000-11-25 04:41:01 +0800
committerFederico Mena Quintero <federico@src.gnome.org>2000-11-25 04:41:01 +0800
commit39dc8f4fc8a9e459689ee61a197270d8e23e68de (patch)
tree38b2f4180db53eab8724396bb7d99baed73be4b6 /calendar/gui
parent0a72c5b5242b4dc732261cd1f3afa8cc72e7ee17 (diff)
downloadgsoc2013-evolution-39dc8f4fc8a9e459689ee61a197270d8e23e68de.tar.gz
gsoc2013-evolution-39dc8f4fc8a9e459689ee61a197270d8e23e68de.tar.zst
gsoc2013-evolution-39dc8f4fc8a9e459689ee61a197270d8e23e68de.zip
Use the new libical external iterators (icalcomponent_begin_component()
2000-11-24 Federico Mena Quintero <federico@helixcode.com> * 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
Diffstat (limited to 'calendar/gui')
-rw-r--r--calendar/gui/e-itip-control.c5
-rw-r--r--calendar/gui/e-meeting-edit.c9
2 files changed, 9 insertions, 5 deletions
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index e545f326be..d3a6a35311 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -592,6 +592,7 @@ pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream,
{
EItipControlPrivate *priv = data;
gint pos, length, length2;
+ icalcompiter iter;
icalcomponent_kind comp_kind;
char message[256];
@@ -617,8 +618,8 @@ pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream,
return;
}
- priv->comp = icalcomponent_get_first_component (priv->main_comp,
- ICAL_ANY_COMPONENT);
+ iter = icalcomponent_begin_component (priv->main_comp, ICAL_ANY_COMPONENT);
+ priv->comp = icalcompiter_deref (&iter);
#if 0
{
diff --git a/calendar/gui/e-meeting-edit.c b/calendar/gui/e-meeting-edit.c
index bdacb7514b..80202fd804 100644
--- a/calendar/gui/e-meeting-edit.c
+++ b/calendar/gui/e-meeting-edit.c
@@ -949,9 +949,12 @@ e_meeting_edit (EMeetingEditor *editor)
priv->organizer_entry = glade_xml_get_widget (priv->xml, "organizer_entry");
- if (icalcomponent_isa (priv->icalcomp) != ICAL_VEVENT_COMPONENT)
- priv->vevent = icalcomponent_get_first_component(priv->icalcomp,ICAL_VEVENT_COMPONENT);
- else
+ if (icalcomponent_isa (priv->icalcomp) != ICAL_VEVENT_COMPONENT) {
+ icalcompiter iter;
+
+ iter = icalcomponent_begin_component (priv->icalcomp, ICAL_VEVENT_COMPONENT);
+ priv->vevent = icalcompiter_deref (&iter);
+ } else
priv->vevent = priv->icalcomp;
g_assert (priv->vevent != NULL);