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

quick-add-popover: fix single all-day events

Browse Source
This commit is contained in:
Georges Basile Stavracas Neto
2016-09-28 01:02:45 -03:00
parent a8f4346e1c
commit 653fb86d16
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-quick-add-popover.c
+7 -6
View File
@@ -415,7 +415,7 @@ edit_or_create_event (GcalQuickAddPopover *self,
GcalEvent *event; GcalEvent *event;
ESource *source; ESource *source;
const gchar *summary; const gchar *summary;
gboolean all_day; gboolean all_day, single_day, is_today;
if (!self->selected_row) if (!self->selected_row)
return; return;
@@ -427,8 +427,9 @@ edit_or_create_event (GcalQuickAddPopover *self,
* We consider all day events multiday and/or non-today events. * We consider all day events multiday and/or non-today events.
* Events on today starts now and lasts 1 hour. * Events on today starts now and lasts 1 hour.
*/ */
all_day = datetime_compare_date (self->date_end, self->date_start) > 1 || single_day = datetime_compare_date (self->date_end, self->date_start) == 0;
datetime_compare_date (now, self->date_start) != 0; is_today = single_day && datetime_compare_date (now, self->date_start) == 0;
all_day = datetime_compare_date (self->date_end, self->date_start) > 1 || !is_today;
tz = all_day ? g_time_zone_new_utc () : g_time_zone_new_local (); tz = all_day ? g_time_zone_new_utc () : g_time_zone_new_local ();
@@ -447,14 +448,14 @@ edit_or_create_event (GcalQuickAddPopover *self,
date_end = g_date_time_new (tz, date_end = g_date_time_new (tz,
g_date_time_get_year (self->date_end), g_date_time_get_year (self->date_end),
g_date_time_get_month (self->date_end), g_date_time_get_month (self->date_end),
g_date_time_get_day_of_month (self->date_end), g_date_time_get_day_of_month (self->date_end)+ (all_day ? 1 : 0),
all_day ? 0 : g_date_time_get_hour (now) + 1, all_day ? 0 : g_date_time_get_hour (now) + (is_today ? 1 : 0),
all_day ? 0 : g_date_time_get_minute (now), all_day ? 0 : g_date_time_get_minute (now),
all_day ? 0 : g_date_time_get_second (now)); all_day ? 0 : g_date_time_get_second (now));
} }
else else
{ {
date_end = g_date_time_add_hours (date_start, 1); date_end = all_day ? g_date_time_add_days (date_start, 1) : g_date_time_add_hours (date_start, 1);
} }
/* Gather the summary */ /* Gather the summary */