]>
Commit | Line | Data |
---|---|---|
3368736e JB |
1 | --- openchange-openchange-2.3-VULCAN/libexchange2ical/exchange2ical_property.c.orig 2019-07-03 05:47:28.580770627 +0200 |
2 | +++ openchange-openchange-2.3-VULCAN/libexchange2ical/exchange2ical_property.c 2019-07-03 17:20:38.425459111 +0200 | |
3 | @@ -517,7 +517,7 @@ | |
4 | icalproperty_add_parameter(prop, tzid); | |
5 | } else { | |
6 | /*Get time from dtstart*/ | |
7 | - icaltime.is_utc = 1; | |
8 | + icaltime_set_timezone(&icaltime, icaltimezone_get_utc_timezone()); | |
9 | if (exchange2ical->apptEndWhole){ | |
10 | dttime = get_icaltime_from_FILETIME_UTC(exchange2ical->apptStartWhole); | |
11 | icaltime.hour = dttime.hour; | |
12 | --- openchange-openchange-2.3-VULCAN/libexchange2ical/exchange2ical_utils.c.orig 2019-07-03 05:47:28.580770627 +0200 | |
13 | +++ openchange-openchange-2.3-VULCAN/libexchange2ical/exchange2ical_utils.c 2019-07-03 17:25:46.117125535 +0200 | |
14 | @@ -241,10 +241,9 @@ | |
15 | tt.minute = tm->tm_min; | |
16 | tt.second = tm->tm_sec; | |
17 | ||
18 | - tt.is_utc = 0; | |
19 | tt.is_date = 0; | |
20 | tt.is_daylight = 0; | |
21 | - tt.zone = 0; | |
22 | + tt.zone = NULL; | |
23 | ||
24 | return tt; | |
25 | } | |
26 | @@ -254,7 +253,7 @@ | |
27 | struct icaltimetype tt; | |
28 | ||
29 | tt = get_icaltimetype_from_tm(tm); | |
30 | - tt.is_utc = 1; | |
31 | + icaltime_set_timezone(&tt, icaltimezone_get_utc_timezone()); | |
32 | ||
33 | return tt; | |
34 | } | |
35 | @@ -269,12 +268,10 @@ | |
36 | tt.hour = 0; | |
37 | tt.minute = 0; | |
38 | tt.second = 0; | |
39 | - tt.zone = NULL; | |
40 | ||
41 | - tt.is_utc = 1; | |
42 | tt.is_date = 1; | |
43 | tt.is_daylight = 0; | |
44 | - tt.zone = NULL; | |
45 | + icaltime_set_timezone(&tt, icaltimezone_get_utc_timezone()); | |
46 | ||
47 | return tt; | |
48 | } | |
49 | @@ -314,7 +311,6 @@ | |
50 | tt.minute = tm->tm_min; | |
51 | tt.second = tm->tm_sec; | |
52 | tt.is_date = 0; | |
53 | - tt.is_utc = 0; | |
54 | tt.is_daylight = 0; | |
55 | tt.zone = NULL; | |
56 | ||
57 | @@ -340,9 +336,8 @@ | |
58 | tt.minute = tm->tm_min; | |
59 | tt.second = tm->tm_sec; | |
60 | tt.is_date = 0; | |
61 | - tt.is_utc = 1; | |
62 | tt.is_daylight = 0; | |
63 | - tt.zone = NULL; | |
64 | + icaltime_set_timezone(&tt, icaltimezone_get_utc_timezone()); | |
65 | ||
66 | return tt; | |
67 | } | |
68 | @@ -372,9 +367,8 @@ | |
69 | tt.minute = 0; | |
70 | tt.second = 0; | |
71 | tt.is_date = 1; | |
72 | - tt.is_utc = 1; | |
73 | tt.is_daylight = 0; | |
74 | - tt.zone = NULL; | |
75 | + icaltime_set_timezone(&tt, icaltimezone_get_utc_timezone()); | |
76 | ||
77 | return tt; | |
78 | } | |
79 | @@ -391,10 +385,9 @@ | |
80 | tt.minute = 0; | |
81 | tt.second = 0; | |
82 | ||
83 | - tt.is_utc = 1; | |
84 | tt.is_date = 1; | |
85 | tt.is_daylight = 0; | |
86 | - tt.zone = NULL; | |
87 | + icaltime_set_timezone(&tt, icaltimezone_get_utc_timezone()); | |
88 | ||
89 | return tt; | |
90 | } |