Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

event: fix comparison if event is today

Browse Source 
Since the end times are open-ended, we have to consider the very second
before the actual end time.

https://bugzilla.gnome.org/show_bug.cgi?id=772104
This commit is contained in:
Georges Basile Stavracas Neto
2016-10-01 20:43:37 -03:00
parent 159da57e46
commit 23cc46a01a
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-event.c
+13 -8
View File
@@ -1360,34 +1360,39 @@ gcal_event_get_uid (GcalEvent *self)
gboolean gboolean
gcal_event_is_multiday (GcalEvent *self) gcal_event_is_multiday (GcalEvent *self)
{ {
GDateTime *end_date; GDateTime *end_date, *real_end_date;
gboolean is_multiday;
gint n_days; gint n_days;
g_return_val_if_fail (GCAL_IS_EVENT (self), FALSE); g_return_val_if_fail (GCAL_IS_EVENT (self), FALSE);
end_date = gcal_event_get_date_end (self); end_date = gcal_event_get_date_end (self);
n_days = g_date_time_difference (end_date, self->dt_start) / G_TIME_SPAN_DAY; real_end_date = g_date_time_add_seconds (end_date, -1);
is_multiday = FALSE;
n_days = g_date_time_difference (real_end_date, self->dt_start) / G_TIME_SPAN_DAY;
/* /*
* An all-day event with only 1 day of time span is treated as a * An all-day event with only 1 day of time span is treated as a
* single-day event. * single-day event.
*/ */
if (self->all_day && n_days == 1) if (self->all_day && n_days == 1)
return FALSE; is_multiday = FALSE;
/* /*
* If any of the following fields are different, we're certain that * If any of the following fields are different, we're certain that
* it's a multiday event. Otherwise, we're certain it's NOT a multiday * it's a multiday event. Otherwise, we're certain it's NOT a multiday
* event. * event.
*/ */
if (g_date_time_get_year (self->dt_start) != g_date_time_get_year (end_date) || if (g_date_time_get_year (self->dt_start) != g_date_time_get_year (real_end_date) ||
g_date_time_get_month (self->dt_start) != g_date_time_get_month (end_date) || g_date_time_get_month (self->dt_start) != g_date_time_get_month (real_end_date) ||
g_date_time_get_day_of_month (self->dt_start) != g_date_time_get_day_of_month (end_date)) g_date_time_get_day_of_month (self->dt_start) != g_date_time_get_day_of_month (real_end_date))
{ {
return TRUE; is_multiday = TRUE;
} }
return FALSE; g_clear_pointer (&real_end_date, g_date_time_unref);
return is_multiday;
} }
/** /**