projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a4982c5
)
* When determining calculating tzid for invitations, take into consideration certain...
author
Art Cancro
<ajc@citadel.org>
Tue, 4 Aug 2009 21:20:04 +0000
(21:20 +0000)
committer
Art Cancro
<ajc@citadel.org>
Tue, 4 Aug 2009 21:20:04 +0000
(21:20 +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 61965b5360addf0b3bd62b72f1499506eaa753d4..6f36c3434ba967fa7196245089940970a3b4feb6 100644
(file)
--- a/
citadel/modules/calendar/serv_calendar.c
+++ b/
citadel/modules/calendar/serv_calendar.c
@@
-1993,6
+1993,8
@@
void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal)
const icaltimezone *z;
int num_zones_attached = 0;
int zone_already_attached;
const icaltimezone *z;
int num_zones_attached = 0;
int zone_already_attached;
+ icalparameter *tzidp = NULL;
+ const char *tzidc = NULL;
if (cal == NULL) {
CtdlLogPrintf(CTDL_ERR, "ERROR: trying to reply to NULL event?\n");
if (cal == NULL) {
CtdlLogPrintf(CTDL_ERR, "ERROR: trying to reply to NULL event?\n");
@@
-2097,6
+2099,15
@@
void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal)
) {
t = icalproperty_get_dtstart(p); // it's safe to use dtstart for all of them
) {
t = icalproperty_get_dtstart(p); // it's safe to use dtstart for all of them
+ /* Determine the tzid in order for some of the conditions below to work */
+ tzidp = icalproperty_get_first_parameter(p, ICAL_TZID_PARAMETER);
+ if (tzidp) {
+ tzidc = icalparameter_get_tzid(tzidp);
+ }
+ else {
+ tzidc = NULL;
+ }
+
/* First see if there's a timezone attached to the data structure itself */
if (icaltime_is_utc(t)) {
z = icaltimezone_get_utc_timezone();
/* First see if there's a timezone attached to the data structure itself */
if (icaltime_is_utc(t)) {
z = icaltimezone_get_utc_timezone();
@@
-2106,21
+2117,13
@@
void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal)
}
/* If not, try to determine the tzid from the parameter using attached zones */
}
/* If not, try to determine the tzid from the parameter using attached zones */
- if (!z) {
- z = icalcomponent_get_timezone(top_level_cal,
- icalparameter_get_tzid(
- icalproperty_get_first_parameter(p, ICAL_TZID_PARAMETER)
- )
- );
+ if ((!z) && (tzidc)) {
+ z = icalcomponent_get_timezone(top_level_cal, tzidc);
}
/* Still no good? Try our internal database */
}
/* Still no good? Try our internal database */
- if (!z) {
- z = icaltimezone_get_builtin_timezone_from_tzid(
- icalparameter_get_tzid(
- icalproperty_get_first_parameter(p, ICAL_TZID_PARAMETER)
- )
- );
+ if ((!z) && (tzidc)) {
+ z = icaltimezone_get_builtin_timezone_from_tzid(tzidc);
}
if (z) {
}
if (z) {