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

week-header: use GDateTime in place of icaltimetype

Browse Source 
Switch to using GDateTime variables in place of icaltimetype variables wherever found.
This commit is contained in:
pandusonu2
2016-12-01 23:48:53 -02:00
committed by Georges Basile Stavracas Neto
parent 4dec80af4f
commit 2e82f0a2b8
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/gcal-week-header.c
+11 -12
View File
@@ -187,6 +187,8 @@ gcal_week_header_draw (GcalWeekHeader *self,
GtkAllocation alloc; GtkAllocation alloc;
GtkBorder padding; GtkBorder padding;
GDateTime *week_start, *week_end;
PangoLayout *layout; PangoLayout *layout;
PangoFontDescription *bold_font; PangoFontDescription *bold_font;
@@ -224,10 +226,9 @@ gcal_week_header_draw (GcalWeekHeader *self,
pango_font_description_set_weight (bold_font, PANGO_WEIGHT_SEMIBOLD); pango_font_description_set_weight (bold_font, PANGO_WEIGHT_SEMIBOLD);
pango_layout_set_font_description (layout, bold_font); pango_layout_set_font_description (layout, bold_font);
start_of_week = self->active_date; week_start = icaltime_to_datetime (self->active_date);
end_of_week = gcal_dup_icaltime (self->active_date); week_end = g_date_time_add_days (week_start, 6);
icaltime_adjust (end_of_week, 6, 0, 0, 0); current_cell = icaltime_day_of_week (*(self->active_date)) - 1;
current_cell = icaltime_day_of_week (*(self->current_date)) - 1;
current_cell = (7 + current_cell - self->first_weekday) % 7; current_cell = (7 + current_cell - self->first_weekday) % 7;
sidebar_width = gcal_week_view_get_sidebar_width (widget); sidebar_width = gcal_week_view_get_sidebar_width (widget);
@@ -249,14 +250,10 @@ gcal_week_header_draw (GcalWeekHeader *self,
gchar *weekday_date, *weekday_abv; gchar *weekday_date, *weekday_abv;
gint n_day; gint n_day;
n_day = start_of_week->day + i; n_day = g_date_time_get_day_of_month (week_start) + i;
if (n_day > icaltime_days_in_month (start_of_week->month, if (n_day > g_date_get_days_in_month (g_date_time_get_month (week_start), g_date_time_get_year (week_start)))
start_of_week->year)) n_day = n_day - g_date_get_days_in_month (g_date_time_get_month (week_start), g_date_time_get_year (week_start));
{
n_day = n_day - icaltime_days_in_month (start_of_week->month,
start_of_week->year);
}
/* Draws the date of days in the week */ /* Draws the date of days in the week */
weekday_date = g_strdup_printf ("%d", n_day); weekday_date = g_strdup_printf ("%d", n_day);
@@ -304,10 +301,12 @@ gcal_week_header_draw (GcalWeekHeader *self,
cairo_restore (cr); cairo_restore (cr);
g_free (start_of_week);
pango_font_description_free (bold_font); pango_font_description_free (bold_font);
g_object_unref (layout); g_object_unref (layout);
g_clear_pointer (&week_start, g_date_time_unref);
g_clear_pointer (&week_end, g_date_time_unref);
return FALSE; return FALSE;
} }