diff options
| author | JP Rosevear <jpr@ximian.com> | 2003-12-16 18:31:01 +0000 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2003-12-16 18:31:01 +0000 |
| commit | 24e5a2d668b633c4043d451d749a713f9175a3fb (patch) | |
| tree | fd404d12f35838cb4f58971aefeb82e917babdd9 | |
| parent | a3695b84544e5739bd2b3e3a5d6801292ab14494 (diff) | |
| download | evolution-data-server-24e5a2d668b633c4043d451d749a713f9175a3fb.tar.gz | |
the info is already in ECalComponent form, no need to process it again,
2003-12-16 JP Rosevear <jpr@ximian.com>
* libecal/e-cal.c (e_cal_get_free_busy): the info is already in
ECalComponent form, no need to process it again, from Gary Ekker
<gekker@novell.com>
Fixes #52218
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/libecal/e-cal.c | 27 |
2 files changed, 9 insertions, 26 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index c525646b8..29f1a4e10 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2003-12-16 JP Rosevear <jpr@ximian.com> + + * libecal/e-cal.c (e_cal_get_free_busy): the info is already in + ECalComponent form, no need to process it again, from Gary Ekker + <gekker@novell.com> + + Fixes #52218 + 2003-12-16 Rodrigo Moya <rodrigo@ximian.com> * backends/groupwise/e-gw-connection.c (parse_response_status): map diff --git a/calendar/libecal/e-cal.c b/calendar/libecal/e-cal.c index 6bd7ee6ba..04233696b 100644 --- a/calendar/libecal/e-cal.c +++ b/calendar/libecal/e-cal.c @@ -2459,32 +2459,7 @@ e_cal_get_free_busy (ECal *ecal, GList *users, time_t start, time_t end, g_cond_wait (our_op->cond, our_op->mutex); status = our_op->status; - - *freebusy = NULL; - for (l = our_op->list; l; l = l->next) { - ECalComponent *comp; - - icalcomponent *icalcomp; - icalcomponent_kind kind; - - icalcomp = icalparser_parse_string (l->data); - if (!icalcomp) - continue; - - kind = icalcomponent_isa (icalcomp); - if (kind == ICAL_VFREEBUSY_COMPONENT) { - comp = e_cal_component_new (); - if (!e_cal_component_set_icalcomponent (comp, icalcomp)) { - icalcomponent_free (icalcomp); - g_object_unref (G_OBJECT (comp)); - continue; - } - - *freebusy = g_list_append (*freebusy, comp); - } - else - icalcomponent_free (icalcomp); - } + *freebusy = our_op->list; e_calendar_remove_op (ecal, our_op); g_mutex_unlock (our_op->mutex); |