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

utils: Move more API to gcal-date-time-utils.c

Browse Source
This commit is contained in:
Georges Basile Stavracas Neto
2019-04-26 13:57:05 -03:00
parent 527cb6fc5f
commit c52bacfc3f
19 changed files with 163 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/gcal-month-cell.c
+2 -2
View File
@@ -99,7 +99,7 @@ update_style_flags (GcalMonthCell *self)
today = g_date_time_new_now_local ();
context = gtk_widget_get_style_context (GTK_WIDGET (self));
if (datetime_compare_date (self->date, today) == 0)
if (gcal_date_time_compare_date (self->date, today) == 0)
gtk_style_context_add_class (context, "today");
else
gtk_style_context_remove_class (context, "today");
@@ -480,7 +480,7 @@ gcal_month_cell_set_date (GcalMonthCell *self,
g_return_if_fail (GCAL_IS_MONTH_CELL (self));
if (self->date && date && datetime_compare_date (self->date, date) == 0)
if (self->date && date && gcal_date_time_compare_date (self->date, date) == 0)
return;
gcal_clear_date_time (&self->date);
src/views/gcal-month-popover.c
+3 -3
View File
@@ -317,8 +317,8 @@ update_event_list (GcalMonthPopover *self)
0, 0, 0);
end_dt = g_date_time_add_days (start_dt, 1);
start = datetime_to_icaltime (start_dt);
end = datetime_to_icaltime (end_dt);
start = gcal_date_time_to_icaltime (start_dt);
end = gcal_date_time_to_icaltime (end_dt);
events = gcal_manager_get_events (gcal_context_get_manager (self->context), start, end);
@@ -878,7 +878,7 @@ gcal_month_popover_set_date (GcalMonthPopover *self,
{
g_return_if_fail (GCAL_IS_MONTH_POPOVER (self));
if (date && self->date && datetime_compare_date (self->date, date) == 0)
if (date && self->date && gcal_date_time_compare_date (self->date, date) == 0)
return;
gcal_clear_date_time (&self->date);
src/views/gcal-month-view.c
+3 -3
View File
@@ -995,15 +995,15 @@ update_month_cells (GcalMonthView *self)
selection_end = selection_start;
/* Swap dates if end is before start */
if (datetime_compare_date (selection_end, selection_start) < 0)
if (gcal_date_time_compare_date (selection_end, selection_start) < 0)
{
GDateTime *aux = selection_end;
selection_end = selection_start;
selection_start = aux;
}
selected = datetime_compare_date (gcal_month_cell_get_date (cell), selection_start) >= 0 &&
datetime_compare_date (gcal_month_cell_get_date (cell), selection_end) <= 0;
selected = gcal_date_time_compare_date (gcal_month_cell_get_date (cell), selection_start) >= 0 &&
gcal_date_time_compare_date (gcal_month_cell_get_date (cell), selection_end) <= 0;
}
gcal_month_cell_set_selected (cell, selected);
src/views/gcal-week-header.c
+1 -1
View File
@@ -1776,7 +1776,7 @@ gcal_week_header_add_event (GcalWeekHeader *self,
}
/* Start position */
if (datetime_compare_date (start_date, week_start) >= 0)
if (gcal_date_time_compare_date (start_date, week_start) >= 0)
start = floor (g_date_time_difference (start_date, week_start) / G_TIME_SPAN_DAY);
else
start = 0;
src/views/gcal-week-view.c
+1 -1
View File
@@ -133,7 +133,7 @@ update_grid_scroll_position (GcalWeekView *self)
week_end = gcal_date_time_get_end_of_week (self->date);
/* Don't animate when not today */
if (datetime_compare_date (now, week_start) < 0 || datetime_compare_date (now, week_end) >= 0)
if (gcal_date_time_compare_date (now, week_start) < 0 || gcal_date_time_compare_date (now, week_end) >= 0)
GCAL_GOTO (out);
vadjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (self->scrolled_window));
src/views/gcal-year-view.c
+9 -9
View File
@@ -272,9 +272,9 @@ update_no_events_page (GcalYearView *year_view)
gchar *title;
now = g_date_time_new_now_local ();
has_range = datetime_compare_date (year_view->start_selected_date, year_view->end_selected_date);
has_range = gcal_date_time_compare_date (year_view->start_selected_date, year_view->end_selected_date);
if (datetime_compare_date (now, year_view->start_selected_date) == 0)
if (gcal_date_time_compare_date (now, year_view->start_selected_date) == 0)
{
title = g_strdup_printf ("%s%s", _("Today"), has_range ? "…" : "");
}
@@ -335,7 +335,7 @@ add_event_to_day_array (GcalYearView *year_view,
gint start_comparison;
cloned_child = child_widget;
start_comparison = datetime_compare_date (dt_start, date);
start_comparison = gcal_date_time_compare_date (dt_start, date);
if (start_comparison > 0)
{
@@ -382,7 +382,7 @@ add_event_to_day_array (GcalYearView *year_view,
cloned_child,
(GCompareFunc) compare_events);
end_comparison = datetime_compare_date (second_date, dt_end);
end_comparison = gcal_date_time_compare_date (second_date, dt_end);
/*
* If the end date surpassed the event's end date, we reached the
@@ -426,8 +426,8 @@ update_sidebar (GcalYearView *year_view)
days_widgets_array = g_new0 (GList*, days_span);
manager = gcal_context_get_manager (year_view->context);
start_icaldatetime = datetime_to_icaltime (year_view->start_selected_date);
end_icaldatetime = datetime_to_icaltime (year_view->end_selected_date);
start_icaldatetime = gcal_date_time_to_icaltime (year_view->start_selected_date);
end_icaldatetime = gcal_date_time_to_icaltime (year_view->end_selected_date);
events = gcal_manager_get_events (manager, start_icaldatetime, end_icaldatetime);
if (events == NULL)
{
@@ -513,7 +513,7 @@ update_sidebar_headers (GtkListBoxRow *row,
row_header = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
now = g_date_time_new_now_local ();
if (datetime_compare_date (year_view->start_selected_date, now) == 0)
if (gcal_date_time_compare_date (year_view->start_selected_date, now) == 0)
label_str = g_strdup (_("Today"));
else
/* Translators: This is a date format in the sidebar of the year view. */
@@ -709,8 +709,8 @@ count_events_at_day (GcalYearView *self,
event_end = g_date_time_ref (gcal_event_get_date_end (event));
if (datetime_compare_date (event_start, today_end) >= 0 ||
datetime_compare_date (event_end, today) < 0)
if (gcal_date_time_compare_date (event_start, today_end) >= 0 ||
gcal_date_time_compare_date (event_end, today) < 0)
{
continue;
}