|
 |
17a85d |
diff -up openchange-openchange-2.3-VULCAN/libexchange2ical/exchange2ical_property.c.libical-3.0 openchange-openchange-2.3-VULCAN/libexchange2ical/exchange2ical_property.c
|
|
|
17a85d |
--- openchange-openchange-2.3-VULCAN/libexchange2ical/exchange2ical_property.c.libical-3.0 2017-11-08 14:45:06.494302213 +0100
|
|
|
17a85d |
+++ openchange-openchange-2.3-VULCAN/libexchange2ical/exchange2ical_property.c 2017-11-08 14:47:33.465300181 +0100
|
|
|
17a85d |
@@ -515,7 +515,7 @@ void ical_property_EXDATE(struct exchang
|
|
|
17a85d |
icalproperty_add_parameter(prop, tzid);
|
|
|
17a85d |
} else {
|
|
|
17a85d |
/*Get time from dtstart*/
|
|
|
17a85d |
- icaltime.is_utc = 1;
|
|
|
17a85d |
+ icaltime.zone = icaltimezone_get_utc_timezone ();
|
|
|
17a85d |
if (exchange2ical->apptEndWhole){
|
|
|
17a85d |
dttime = get_icaltime_from_FILETIME_UTC(exchange2ical->apptStartWhole);
|
|
|
17a85d |
icaltime.hour = dttime.hour;
|
|
|
17a85d |
diff -up openchange-openchange-2.3-VULCAN/libexchange2ical/exchange2ical_utils.c.libical-3.0 openchange-openchange-2.3-VULCAN/libexchange2ical/exchange2ical_utils.c
|
|
|
17a85d |
--- openchange-openchange-2.3-VULCAN/libexchange2ical/exchange2ical_utils.c.libical-3.0 2017-11-08 14:45:43.123301706 +0100
|
|
|
17a85d |
+++ openchange-openchange-2.3-VULCAN/libexchange2ical/exchange2ical_utils.c 2017-11-08 14:47:31.873300203 +0100
|
|
|
17a85d |
@@ -241,10 +241,9 @@ struct icaltimetype get_icaltimetype_fro
|
|
|
17a85d |
tt.minute = tm->tm_min;
|
|
|
17a85d |
tt.second = tm->tm_sec;
|
|
|
17a85d |
|
|
|
17a85d |
- tt.is_utc = 0;
|
|
|
17a85d |
tt.is_date = 0;
|
|
|
17a85d |
tt.is_daylight = 0;
|
|
|
17a85d |
- tt.zone = 0;
|
|
|
17a85d |
+ tt.zone = icaltimezone_get_utc_timezone ();
|
|
|
17a85d |
|
|
|
17a85d |
return tt;
|
|
|
17a85d |
}
|
|
|
17a85d |
@@ -254,7 +253,6 @@ struct icaltimetype get_icaltimetype_fro
|
|
|
17a85d |
struct icaltimetype tt;
|
|
|
17a85d |
|
|
|
17a85d |
tt = get_icaltimetype_from_tm(tm);
|
|
|
17a85d |
- tt.is_utc = 1;
|
|
|
17a85d |
|
|
|
17a85d |
return tt;
|
|
|
17a85d |
}
|
|
|
17a85d |
@@ -270,10 +268,8 @@ struct icaltimetype get_icaldate_from_tm
|
|
|
17a85d |
tt.minute = 0;
|
|
|
17a85d |
tt.second = 0;
|
|
|
17a85d |
|
|
|
17a85d |
- tt.is_utc = 1;
|
|
|
17a85d |
tt.is_date = 1;
|
|
|
17a85d |
tt.is_daylight = 0;
|
|
|
17a85d |
- tt.zone = NULL;
|
|
|
17a85d |
|
|
|
17a85d |
return tt;
|
|
|
17a85d |
}
|
|
|
17a85d |
@@ -313,7 +309,6 @@ struct icaltimetype get_icaltime_from_FI
|
|
|
17a85d |
tt.minute = tm->tm_min;
|
|
|
17a85d |
tt.second = tm->tm_sec;
|
|
|
17a85d |
tt.is_date = 0;
|
|
|
17a85d |
- tt.is_utc = 0;
|
|
|
17a85d |
tt.is_daylight = 0;
|
|
|
17a85d |
tt.zone = NULL;
|
|
|
17a85d |
|
|
|
17a85d |
@@ -339,9 +334,8 @@ struct icaltimetype get_icaltime_from_FI
|
|
|
17a85d |
tt.minute = tm->tm_min;
|
|
|
17a85d |
tt.second = tm->tm_sec;
|
|
|
17a85d |
tt.is_date = 0;
|
|
|
17a85d |
- tt.is_utc = 1;
|
|
|
17a85d |
tt.is_daylight = 0;
|
|
|
17a85d |
- tt.zone = NULL;
|
|
|
17a85d |
+ tt.zone = icaltimezone_get_utc_timezone ();
|
|
|
17a85d |
|
|
|
17a85d |
return tt;
|
|
|
17a85d |
}
|
|
|
17a85d |
@@ -371,9 +365,8 @@ struct icaltimetype get_icaldate_from_FI
|
|
|
17a85d |
tt.minute = 0;
|
|
|
17a85d |
tt.second = 0;
|
|
|
17a85d |
tt.is_date = 1;
|
|
|
17a85d |
- tt.is_utc = 1;
|
|
|
17a85d |
tt.is_daylight = 0;
|
|
|
17a85d |
- tt.zone = NULL;
|
|
|
17a85d |
+ tt.zone = icaltimezone_get_utc_timezone ();
|
|
|
17a85d |
|
|
|
17a85d |
return tt;
|
|
|
17a85d |
}
|
|
|
17a85d |
@@ -390,10 +383,9 @@ struct icaltimetype get_icaldate_from_Gl
|
|
|
17a85d |
tt.minute = 0;
|
|
|
17a85d |
tt.second = 0;
|
|
|
17a85d |
|
|
|
17a85d |
- tt.is_utc = 1;
|
|
|
17a85d |
tt.is_date = 1;
|
|
|
17a85d |
tt.is_daylight = 0;
|
|
|
17a85d |
- tt.zone = NULL;
|
|
|
17a85d |
+ tt.zone = icaltimezone_get_utc_timezone ();
|
|
|
17a85d |
|
|
|
17a85d |
return tt;
|
|
|
17a85d |
}
|