From 74ac2d83ee165d6d1f888762a7fa6146e07f44d2 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Thu, 8 Dec 2016 14:18:37 -0200 Subject: [PATCH] week-view: fix active and current date handling The active date is the visible date, while the current date is today. We shouldn't confuse those two. --- src/views/gcal-week-header.c | 1 + src/views/gcal-week-view.c | 9 +++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/views/gcal-week-header.c b/src/views/gcal-week-header.c index 8b1acf2e..ff4206f4 100644 --- a/src/views/gcal-week-header.c +++ b/src/views/gcal-week-header.c @@ -857,6 +857,7 @@ gcal_week_header_finalize (GObject *object) GcalWeekHeader *self = GCAL_WEEK_HEADER (object); gint i; + g_clear_pointer (&self->active_date, g_free); g_clear_pointer (&self->current_date, g_free); for (i = 0; i < 7; i++) diff --git a/src/views/gcal-week-view.c b/src/views/gcal-week-view.c index 7061c863..19fc1dcd 100644 --- a/src/views/gcal-week-view.c +++ b/src/views/gcal-week-view.c @@ -456,7 +456,8 @@ gcal_week_view_set_property (GObject *object, { case PROP_DATE: { - gcal_week_view_set_current_date (self, g_value_dup_boxed (value)); + g_clear_pointer (&self->date, g_free); + self->date = g_value_dup_boxed (value); break; } @@ -552,12 +553,8 @@ gcal_week_view_set_current_date (GcalWeekView *self, g_return_if_fail (GCAL_IS_WEEK_VIEW (self)); g_clear_pointer (&self->current_date, g_free); - self->date = current_date; + self->current_date = current_date; gcal_week_header_set_current_date (GCAL_WEEK_HEADER (self->header), current_date); gcal_week_grid_set_current_date (GCAL_WEEK_GRID (self->week_grid), current_date); - - self->current_date = current_date; - - g_object_notify (G_OBJECT (self), "active-date"); }