1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
|
$NetBSD: patch-ab,v 1.7 2009/03/19 18:54:42 drochner Exp $
--- applets/clock/calendar-client.c.orig 2009-01-13 01:02:20.000000000 +0100
+++ applets/clock/calendar-client.c
@@ -523,7 +523,7 @@ calendar_client_new (void)
*
* "What?", you say, "Something useful in libc?"
*/
-static inline GTime
+static inline time_t
make_time_for_day_begin (int day,
int month,
int year)
@@ -543,14 +543,14 @@ make_isodate_for_day_begin (int day,
int month,
int year)
{
- GTime utctime;
+ time_t utctime;
utctime = make_time_for_day_begin (day, month, year);
return utctime != -1 ? isodate_from_time_t (utctime) : NULL;
}
-static GTime
+static time_t
get_time_from_property (icalcomponent *ical,
icalproperty_kind prop_kind,
struct icaltimetype (* get_prop_func) (const icalproperty *prop),
@@ -624,7 +624,7 @@ get_ical_description (icalcomponent *ica
return g_strdup (icalproperty_get_description (prop));
}
-static inline GTime
+static inline time_t
get_ical_start_time (icalcomponent *ical,
icaltimezone *default_zone)
{
@@ -634,7 +634,7 @@ get_ical_start_time (icalcomponent *ical
default_zone);
}
-static inline GTime
+static inline time_t
get_ical_end_time (icalcomponent *ical,
icaltimezone *default_zone)
{
@@ -646,13 +646,12 @@ get_ical_end_time (icalcomponent *ical,
static gboolean
get_ical_is_all_day (icalcomponent *ical,
- GTime start_gtime,
+ time_t start_time,
icaltimezone *default_zone)
{
icalproperty *prop;
- time_t start_time;
struct tm *start_tm;
- GTime end_time;
+ time_t end_time;
struct icaldurationtype duration;
struct icaltimetype start_icaltime;
@@ -660,7 +659,6 @@ get_ical_is_all_day (icalcomponent *ical
if (start_icaltime.is_date)
return TRUE;
- start_time = (time_t) start_gtime;
start_tm = gmtime (&start_time);
if (start_tm->tm_sec != 0 ||
start_tm->tm_min != 0 ||
@@ -679,7 +677,7 @@ get_ical_is_all_day (icalcomponent *ical
return icaldurationtype_as_int (duration) % 86400 == 0;
}
-static inline GTime
+static inline time_t
get_ical_due_time (icalcomponent *ical,
icaltimezone *default_zone)
{
@@ -713,7 +711,7 @@ get_ical_percent_complete (icalcomponent
return CLAMP (percent_complete, 0, 100);
}
-static inline GTime
+static inline time_t
get_ical_completed_time (icalcomponent *ical,
icaltimezone *default_zone)
{
@@ -909,11 +907,12 @@ resolve_timezone_id (const char *tzid,
static gboolean
calendar_appointment_collect_occurrence (ECalComponent *component,
- GTime occurrence_start,
- GTime occurrence_end,
- GSList **collect_loc)
+ time_t occurrence_start,
+ time_t occurrence_end,
+ gpointer data)
{
CalendarOccurrence *occurrence;
+ GSList **collect_loc = data;
occurrence = g_new0 (CalendarOccurrence, 1);
occurrence->start_time = occurrence_start;
@@ -928,8 +927,8 @@ static void
calendar_appointment_generate_ocurrences (CalendarAppointment *appointment,
icalcomponent *ical,
ECal *source,
- GTime start,
- GTime end,
+ time_t start,
+ time_t end,
icaltimezone *default_zone)
{
ECalComponent *ecal;
@@ -943,7 +942,7 @@ calendar_appointment_generate_ocurrences
e_cal_recur_generate_instances (ecal,
start,
end,
- (ECalRecurInstanceFn) calendar_appointment_collect_occurrence,
+ calendar_appointment_collect_occurrence,
&appointment->occurrences,
(ECalRecurResolveTimezoneFn) resolve_timezone_id,
source,
@@ -1160,8 +1159,8 @@ static void
calendar_event_generate_ocurrences (CalendarEvent *event,
icalcomponent *ical,
ECal *source,
- GTime start,
- GTime end,
+ time_t start,
+ time_t end,
icaltimezone *default_zone)
{
if (event->type != CALENDAR_EVENT_APPOINTMENT)
@@ -1332,8 +1331,8 @@ calendar_client_handle_query_result (Cal
gboolean emit_signal;
gboolean events_changed;
GList *l;
- GTime month_begin;
- GTime month_end;
+ time_t month_begin;
+ time_t month_end;
client = source->client;
@@ -1846,8 +1845,8 @@ typedef struct
{
CalendarClient *client;
GSList *events;
- GTime start_time;
- GTime end_time;
+ time_t start_time;
+ time_t end_time;
} FilterData;
typedef void (* CalendarEventFilterFunc) (const char *uid,
@@ -1870,8 +1869,8 @@ filter_appointment (const char *uid,
for (l = occurrences; l; l = l->next)
{
CalendarOccurrence *occurrence = l->data;
- GTime start_time = occurrence->start_time;
- GTime end_time = occurrence->end_time;
+ time_t start_time = occurrence->start_time;
+ time_t end_time = occurrence->end_time;
if ((start_time >= filter_data->start_time &&
start_time < filter_data->end_time) ||
@@ -1924,8 +1923,8 @@ static GSList *
calendar_client_filter_events (CalendarClient *client,
GSList *sources,
CalendarEventFilterFunc filter_func,
- GTime start_time,
- GTime end_time)
+ time_t start_time,
+ time_t end_time)
{
FilterData filter_data;
GSList *l;
@@ -1966,8 +1965,8 @@ calendar_client_get_events (CalendarClie
{
GSList *appointments;
GSList *tasks;
- GTime day_begin;
- GTime day_end;
+ time_t day_begin;
+ time_t day_end;
g_return_val_if_fail (CALENDAR_IS_CLIENT (client), NULL);
g_return_val_if_fail (client->priv->day != -1 &&
@@ -2021,8 +2020,8 @@ calendar_client_foreach_appointment_day
{
GSList *appointments, *l;
gboolean marked_days [32] = { FALSE, };
- GTime month_begin;
- GTime month_end;
+ time_t month_begin;
+ time_t month_end;
int i;
g_return_if_fail (CALENDAR_IS_CLIENT (client));
@@ -2048,7 +2047,7 @@ calendar_client_foreach_appointment_day
if (appointment->start_time)
{
- GTime day_time = appointment->start_time;
+ time_t day_time = appointment->start_time;
if (day_time >= month_begin)
marked_days [day_from_time_t (day_time)] = TRUE;
@@ -2060,7 +2059,7 @@ calendar_client_foreach_appointment_day
/* mark the days for the appointment, no need to add an extra one when duration is a multiple of 86400 */
for (day_offset = 1; day_offset <= duration / 86400 && duration != day_offset * 86400; day_offset++)
{
- GTime day_tm = appointment->start_time + day_offset * 86400;
+ time_t day_tm = appointment->start_time + day_offset * 86400;
if (day_tm > month_end)
break;
@@ -2124,7 +2123,7 @@ calendar_client_set_task_completed (Cale
{
struct icaltimetype completed_time;
- completed_time = icaltime_current_time_with_zone (client->priv->zone);
+ completed_time = icaltime_current_time_with_zone (icaltimezone_get_utc_timezone ());
if (!prop)
{
icalcomponent_add_property (ical,
|
