mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 10:44:56 +00:00
Bringing code up-to-date with libical official CVS on Apr 29th 2002 ( Fixes bug 140793 )
This commit is contained in:
parent
372d7a7e50
commit
2c12f84939
@ -2,7 +2,7 @@
|
||||
FILE: icalcomponent.c
|
||||
CREATOR: eric 28 April 1999
|
||||
|
||||
$Id: icalcomponent.c,v 1.7 2002/04/18 18:47:25 mostafah%oeone.com Exp $
|
||||
$Id: icalcomponent.c,v 1.8 2002/04/29 15:14:40 mostafah%oeone.com Exp $
|
||||
|
||||
|
||||
(C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
|
||||
@ -279,11 +279,15 @@ icalcomponent_as_ical_string (icalcomponent* component)
|
||||
pvl_elem itr;
|
||||
struct icalcomponent_impl *impl = (struct icalcomponent_impl*)component;
|
||||
|
||||
/* WIN32 automatically adds the \r, Anybody else need it?
|
||||
#ifdef ICAL_UNIX_NEWLINE
|
||||
*/
|
||||
char newline[] = "\n";
|
||||
/*
|
||||
#else
|
||||
char newline[] = "\r\n";
|
||||
#endif
|
||||
*/
|
||||
|
||||
icalcomponent *c;
|
||||
icalproperty *p;
|
||||
@ -1192,7 +1196,7 @@ icalcomponent_begin_component(icalcomponent* component,icalcomponent_kind kind)
|
||||
|
||||
icalerror_check_arg_re( (component!=0),"component",icalcompiter_null);
|
||||
|
||||
// for( i = pvl_head(impl->components); i != 0; i = pvl_next(itr.iter)) {
|
||||
/* for( i = pvl_head(impl->components); i != 0; i = pvl_next(itr.iter)) { */
|
||||
for( i = pvl_head(impl->components); i != 0; i = pvl_next(i)) {
|
||||
|
||||
icalcomponent *c = (icalcomponent*) pvl_data(i);
|
||||
|
@ -3,7 +3,7 @@
|
||||
FILE: icalrecur.c
|
||||
CREATOR: eric 16 May 2000
|
||||
|
||||
$Id: icalrecur.c,v 1.3 2002/03/14 15:17:52 mikep%oeone.com Exp $
|
||||
$Id: icalrecur.c,v 1.4 2002/04/29 15:14:41 mostafah%oeone.com Exp $
|
||||
$Locker: $
|
||||
|
||||
|
||||
@ -919,7 +919,7 @@ icalrecur_iterator* icalrecur_iterator_new(struct icalrecurrencetype rule,
|
||||
for (;;) {
|
||||
expand_year_days(impl,impl->last.year);
|
||||
if (impl->days[0] != ICAL_RECURRENCE_ARRAY_MAX)
|
||||
break; // break when no days are expanded
|
||||
break; /* break when no days are expanded */
|
||||
increment_year(impl,impl->rule.interval);
|
||||
}
|
||||
|
||||
|
@ -224,7 +224,7 @@ char* icalrestriction_must_have_duration(icalrestriction_property_record *rec,
|
||||
|
||||
if( !icalcomponent_get_first_property(comp,ICAL_DURATION_PROPERTY)){
|
||||
|
||||
return "Failed iTIP restrictions for STATUS property. This component must have a DURATION property";
|
||||
return "Failed iTIP restrictions. This component must have a DURATION property";
|
||||
|
||||
}
|
||||
|
||||
@ -235,7 +235,7 @@ char* icalrestriction_must_have_repeat(icalrestriction_property_record *rec,
|
||||
icalproperty* prop){
|
||||
if( !icalcomponent_get_first_property(comp,ICAL_REPEAT_PROPERTY)){
|
||||
|
||||
return "Failed iTIP restrictions for STATUS property. This component must have a REPEAT property";
|
||||
return "Failed iTIP restrictions. This component must have a REPEAT property";
|
||||
|
||||
}
|
||||
|
||||
@ -252,9 +252,9 @@ char* icalrestriction_no_dtend(icalrestriction_property_record *rec,
|
||||
icalcomponent* comp,
|
||||
icalproperty* prop){
|
||||
|
||||
if( !icalcomponent_get_first_property(comp,ICAL_DTEND_PROPERTY)){
|
||||
if( icalcomponent_get_first_property(comp,ICAL_DTEND_PROPERTY)){
|
||||
|
||||
return "Failed iTIP restrictions for STATUS property. The component must not have both DURATION and DTEND";
|
||||
return "Failed iTIP restrictions. The component must not have both DURATION and DTEND";
|
||||
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user