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

import-file-row: correctly display start and end dates in import dialog

Browse Source 
In the import dialog, start and end date-time fields were being
incorrectly displayed, not considering the local timezone and the
24-hours vs 12-hours format used by the user. Also, the libical
already deals with the case in which events do not have the DTEND
field, simplifying the implementation.

Fixes #1175
This commit is contained in:
Otávio Silva
2024-07-20 20:20:16 +00:00
committed by Georges Basile Stavracas Neto
parent 0bc006be5c
commit c175073ab0
1 changed files with 37 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/importer/gcal-import-file-row.c
+37 -14
View File
@@ -116,7 +116,9 @@ fill_grid_with_event_data (GcalImportFileRow *self,
g_autofree gchar *description = NULL; g_autofree gchar *description = NULL;
g_autofree gchar *end_string = NULL; g_autofree gchar *end_string = NULL;
g_autoptr (GDateTime) start = NULL; g_autoptr (GDateTime) start = NULL;
g_autoptr (GDateTime) start_local = NULL;
g_autoptr (GDateTime) end = NULL; g_autoptr (GDateTime) end = NULL;
g_autoptr (GDateTime) end_local = NULL;
ICalTime *ical_start; ICalTime *ical_start;
ICalTime *ical_end; ICalTime *ical_end;
gint row = 0; gint row = 0;
@@ -126,24 +128,45 @@ fill_grid_with_event_data (GcalImportFileRow *self,
if (i_cal_time_is_date (ical_start)) if (i_cal_time_is_date (ical_start))
start_string = g_date_time_format (start, "%x"); start_string = g_date_time_format (start, "%x");
else else
start_string = g_date_time_format (start, "%x %X"); {
start_local = g_date_time_to_local (start);
switch (gcal_context_get_time_format (self->context))
{
case GCAL_TIME_FORMAT_24H:
start_string = g_date_time_format (start_local, "%x %R");
break;
case GCAL_TIME_FORMAT_12H:
start_string = g_date_time_format (start_local, "%x %I:%M %P");
break;
default:
g_assert_not_reached ();
}
}
ical_end = i_cal_component_get_dtend (ical_component); ical_end = i_cal_component_get_dtend (ical_component);
if (ical_end) end = gcal_date_time_from_icaltime (ical_end);
{ if (i_cal_time_is_date (ical_end))
end = gcal_date_time_from_icaltime (ical_end); end_string = g_date_time_format (end, "%x");
if (i_cal_time_is_date (ical_end))
end_string = g_date_time_format (end, "%x");
else
end_string = g_date_time_format (end, "%x %X");
}
else else
{ {
end = g_date_time_add_days (start, 1); end_local = g_date_time_to_local (end);
if (i_cal_time_is_date (ical_start))
end_string = g_date_time_format (end, "%x"); switch (gcal_context_get_time_format (self->context))
else {
end_string = g_date_time_format (end, "%x %X"); case GCAL_TIME_FORMAT_24H:
end_string = g_date_time_format (end_local, "%x %R");
break;
case GCAL_TIME_FORMAT_12H:
end_string = g_date_time_format (end_local, "%x %I:%M %P");
break;
default:
g_assert_not_reached ();
}
} }
gcal_utils_extract_google_section (i_cal_component_get_description (ical_component), gcal_utils_extract_google_section (i_cal_component_get_description (ical_component),