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

window: use GDateTimes to pass the range

Browse Source 
Another case where we can improve the code by porting
to GLib's api.
This commit is contained in:
Georges Basile Stavracas Neto
2016-02-18 03:31:35 +01:00
parent 5a75abb52e
commit b1184978b1
1 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-window.c
+15 -27
View File
@@ -346,12 +346,9 @@ static void
update_active_date (GcalWindow *window, update_active_date (GcalWindow *window,
icaltimetype *new_date) icaltimetype *new_date)
{ {
GDateTime *date_start, *date_end;
time_t range_start, range_end; time_t range_start, range_end;
icaltimetype date;
icaltimetype *previous_date; icaltimetype *previous_date;
icaltimezone* default_zone;
default_zone = gcal_manager_get_system_timezone (window->manager);
previous_date = window->active_date; previous_date = window->active_date;
window->active_date = new_date; window->active_date = new_date;
@@ -360,40 +357,31 @@ update_active_date (GcalWindow *window,
/* year_view */ /* year_view */
if (previous_date->year != new_date->year) if (previous_date->year != new_date->year)
{ {
date = *new_date; date_start = g_date_time_new_local (new_date->year, 1, 1, 0, 0, 0);
date.day = 1; range_start = g_date_time_to_unix (date_start);
date.month = 1;
date.hour = 0;
date.minute = 0;
date.second = 0;
date.is_date = 0;
date.zone = default_zone;
range_start = icaltime_as_timet (date);
date.year++; date_end = g_date_time_add_years (date_start, 1);
date = icaltime_normalize (date); range_end = g_date_time_to_unix (date_end);
range_end = icaltime_as_timet (date);
gcal_manager_set_subscriber (window->manager, E_CAL_DATA_MODEL_SUBSCRIBER (window->year_view), range_start, range_end); gcal_manager_set_subscriber (window->manager, E_CAL_DATA_MODEL_SUBSCRIBER (window->year_view), range_start, range_end);
g_clear_pointer (&date_start, g_date_time_unref);
g_clear_pointer (&date_end, g_date_time_unref);
} }
/* month_view */ /* month_view */
if (previous_date->month != new_date->month || previous_date->year != new_date->year) if (previous_date->month != new_date->month || previous_date->year != new_date->year)
{ {
date = *new_date; date_start = g_date_time_new_local (new_date->year, new_date->month, 1, 0, 0, 0);
date.day = 1; range_start = g_date_time_to_unix (date_start);
date.hour = 0;
date.minute = 0;
date.second = 0;
date.is_date = 0;
date.zone = default_zone;
range_start = icaltime_as_timet (date);
date.month++; date_end = g_date_time_add_months (date_start, 1);
date = icaltime_normalize (date); range_end = g_date_time_to_unix (date_end);
range_end = icaltime_as_timet (date);
gcal_manager_set_subscriber (window->manager, E_CAL_DATA_MODEL_SUBSCRIBER (window->month_view), range_start, range_end); gcal_manager_set_subscriber (window->manager, E_CAL_DATA_MODEL_SUBSCRIBER (window->month_view), range_start, range_end);
g_clear_pointer (&date_start, g_date_time_unref);
g_clear_pointer (&date_end, g_date_time_unref);
} }
g_free (previous_date); g_free (previous_date);