projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e87f775
)
* default to UTC while comparing
author
Wilfried Göesgens
<willi@citadel.org>
Sat, 26 Apr 2008 13:37:22 +0000
(13:37 +0000)
committer
Wilfried Göesgens
<willi@citadel.org>
Sat, 26 Apr 2008 13:37:22 +0000
(13:37 +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 cc134e0d1a721623ca9e06b623a4ef78e66fa576..7106a367273cfc00eae5dd34ea4991fc7c6a8351 100644
(file)
--- a/
citadel/modules/calendar/serv_calendar.c
+++ b/
citadel/modules/calendar/serv_calendar.c
@@
-861,22
+861,26
@@
int ical_ctdl_is_overlap(
/* First, check for all-day events */
if (t1start.is_date) {
/* First, check for all-day events */
if (t1start.is_date) {
- if (!icaltime_compare_date_only(t1start, t2start)) {
+ if (!icaltime_compare_date_only(t1start, t2start,
+ icaltimezone_get_utc_timezone())) {
return(1);
}
if (!icaltime_is_null_time(t2end)) {
return(1);
}
if (!icaltime_is_null_time(t2end)) {
- if (!icaltime_compare_date_only(t1start, t2end)) {
+ if (!icaltime_compare_date_only(t1start, t2end,
+ icaltimezone_get_utc_timezone())) {
return(1);
}
}
}
if (t2start.is_date) {
return(1);
}
}
}
if (t2start.is_date) {
- if (!icaltime_compare_date_only(t2start, t1start)) {
+ if (!icaltime_compare_date_only(t2start, t1start,
+ icaltimezone_get_utc_timezone())) {
return(1);
}
if (!icaltime_is_null_time(t1end)) {
return(1);
}
if (!icaltime_is_null_time(t1end)) {
- if (!icaltime_compare_date_only(t2start, t1end)) {
+ if (!icaltime_compare_date_only(t2start, t1end,
+ icaltimezone_get_utc_timezone())) {
return(1);
}
}
return(1);
}
}