projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b3ea8c2
)
Fixed a bug in previous commit (still commented out)
author
Art Cancro
<ajc@citadel.org>
Tue, 19 Aug 2008 22:16:21 +0000
(22:16 +0000)
committer
Art Cancro
<ajc@citadel.org>
Tue, 19 Aug 2008 22:16:21 +0000
(22:16 +0000)
citadel/modules/calendar/serv_calendar.c
patch
|
blob
|
history
diff --git
a/citadel/modules/calendar/serv_calendar.c
b/citadel/modules/calendar/serv_calendar.c
index 0b9d0754ec541bb74819a3e891fbcb54d5c866bb..fcc16a3cbd3ed30ec75cf91223076a76473da50a 100644
(file)
--- a/
citadel/modules/calendar/serv_calendar.c
+++ b/
citadel/modules/calendar/serv_calendar.c
@@
-958,10
+958,10
@@
void ical_conflicts_phase5(struct icaltimetype t1start,
struct icaltimetype t2start, t2end;
icalproperty *p;
struct icaltimetype t2start, t2end;
icalproperty *p;
- /* recur variables
- icalproperty *rrule = NULL;
+ /* recur variables
*/
+
/*
icalproperty *rrule = NULL;
struct icalrecurrencetype recur;
struct icalrecurrencetype recur;
- icalrecur_iterator *ritr = NULL;
*/
+ icalrecur_iterator *ritr = NULL;*/
/* initialization */
strcpy(conflict_event_uid, "");
/* initialization */
strcpy(conflict_event_uid, "");
@@
-982,7
+982,7
@@
void ical_conflicts_phase5(struct icaltimetype t1start,
/*rrule = ical_ctdl_get_subprop(existing_event, ICAL_RRULE_PROPERTY);
if (rrule) {
recur = icalproperty_get_rrule(rrule);
/*rrule = ical_ctdl_get_subprop(existing_event, ICAL_RRULE_PROPERTY);
if (rrule) {
recur = icalproperty_get_rrule(rrule);
- ritr = icalrecur_iterator_new(recur, t
1
start);
+ ritr = icalrecur_iterator_new(recur, t
2
start);
CtdlLogPrintf(CTDL_DEBUG, "Recurrence found: %s\n", icalrecurrencetype_as_string(&recur));
}
CtdlLogPrintf(CTDL_DEBUG, "Recurrence found: %s\n", icalrecurrencetype_as_string(&recur));
}
@@
-1001,11
+1001,11
@@
void ical_conflicts_phase5(struct icaltimetype t1start,
existing_msgnum, conflict_event_uid, conflict_event_summary, compare_uid
);
existing_msgnum, conflict_event_uid, conflict_event_summary, compare_uid
);
-
/*
if (rrule) {
- t
1
start = icalrecur_iterator_next(ritr);
+
/*
if (rrule) {
+ t
2
start = icalrecur_iterator_next(ritr);
}
}
- } while ( (rrule) && (!icaltime_is_null_time(t
1
start)) );*/
+ } while ( (rrule) && (!icaltime_is_null_time(t
2
start)) );*/
}
}