Updating branch refs/heads/master to 25aad2c8d17591bea3d7a65998da990c38b958d7 (commit) from 38ef8b460ce4ae627d5539c3db1f80137cceeab9 (commit)
commit 25aad2c8d17591bea3d7a65998da990c38b958d7 Author: Juha Kautto <j...@xfce.org> Date: Fri Nov 20 17:41:55 2009 +0200 minor fixes to libical 1) fixed wrong reference to a variable 2) made it possible to use alsot time in EXDATE defines Neither of these is currently used in Orage, so really minor. libical/src/libical/icalcomponent.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libical/src/libical/icalcomponent.c b/libical/src/libical/icalcomponent.c index 4ac2cc8..5a3ac24 100644 --- a/libical/src/libical/icalcomponent.c +++ b/libical/src/libical/icalcomponent.c @@ -854,7 +854,9 @@ int icalproperty_recurrence_is_excluded(icalcomponent *comp, /* if (icaltime_compare(*recurtime, exdatetime) == 0) { */ - if (icaltime_compare_date_only(*recurtime, exdatetime) == 0) { + if ((icaltime_is_date(exdatetime) + && icaltime_compare_date_only(*recurtime, exdatetime) == 0) + || (icaltime_compare(*recurtime, exdatetime) == 0)) { /** MATCHED **/ return 1; } @@ -862,8 +864,8 @@ int icalproperty_recurrence_is_excluded(icalcomponent *comp, /** Now test against the EXRULEs **/ for (exrule = icalcomponent_get_first_property(comp,ICAL_EXRULE_PROPERTY); - exdate != NULL; - exdate = icalcomponent_get_next_property(comp,ICAL_EXRULE_PROPERTY)) { + exrule != NULL; + exrule = icalcomponent_get_next_property(comp,ICAL_EXRULE_PROPERTY)) { struct icalrecurrencetype recur = icalproperty_get_exrule(exrule); icalrecur_iterator *exrule_itr = icalrecur_iterator_new(recur, *dtstart); _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits