[gnome-calendar] month-view: compare to adjusted dates
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calendar] month-view: compare to adjusted dates
- Date: Wed, 17 Feb 2016 18:12:18 +0000 (UTC)
commit d87a6e5bfd9a061339ba1f9e371daee67aa35e4f
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Wed Feb 17 19:09:59 2016 +0100
month-view: compare to adjusted dates
src/gcal-month-view.c | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/src/gcal-month-view.c b/src/gcal-month-view.c
index 7f65291..2b4a97e 100644
--- a/src/gcal-month-view.c
+++ b/src/gcal-month-view.c
@@ -1098,13 +1098,15 @@ gcal_month_view_size_allocate (GtkWidget *widget,
* month. Otherwise, the first cell is the 1st day of the month.
*/
j = 1;
- date = gcal_event_get_date_start (event);
+ date = g_date_time_to_local (gcal_event_get_date_start (event));
if (g_date_time_get_month (date) == priv->date->month)
j = g_date_time_get_day_of_month (date);
j += priv->days_delay;
+ g_clear_pointer (&date, g_date_time_unref);
+
/*
* Calculate the first cell position according to the locale
* and the start date.
@@ -1116,7 +1118,7 @@ gcal_month_view_size_allocate (GtkWidget *widget,
* if the event is all day or not.
*/
j = icaltime_days_in_month (priv->date->month, priv->date->year);
- date = gcal_event_get_date_end (event);
+ date = g_date_time_to_local (gcal_event_get_date_end (event));
if (g_date_time_get_month (date) == priv->date->month)
{
@@ -1128,6 +1130,8 @@ gcal_month_view_size_allocate (GtkWidget *widget,
}
j += priv->days_delay;
+ g_clear_pointer (&date, g_date_time_unref);
+
last_cell = 7 * ((j - 1) / 7)+ 6 * priv->k + sw * ((j - 1) % 7);
/*
@@ -1839,11 +1843,18 @@ static guint
gcal_month_view_get_child_cell (GcalSubscriberView *subscriber,
GcalEventWidget *child)
{
+ GcalEvent *event;
GDateTime *dt;
+ gint cell;
- dt = gcal_event_widget_get_date_start (child);
+ event = gcal_event_widget_get_event (child);
+ dt = g_date_time_to_local (gcal_event_get_date_start (event));
- return g_date_time_get_day_of_month (dt);
+ cell = g_date_time_get_day_of_month (dt);
+
+ g_clear_pointer (&dt, g_date_time_unref);
+
+ return cell;
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]