From c777d4c8527a56c9983cbb97ed4a8c7c1d371dc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erick=20P=C3=A9rez=20Castellanos?= Date: Thu, 16 Oct 2014 15:21:16 -0400 Subject: [PATCH] views: use new comparison function --- src/gcal-week-view.c | 11 +++++------ src/gcal-year-view.c | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/gcal-week-view.c b/src/gcal-week-view.c index b131b07b..a6f2ace4 100644 --- a/src/gcal-week-view.c +++ b/src/gcal-week-view.c @@ -801,16 +801,15 @@ gcal_week_view_add (GtkContainer *container, for (l = priv->days[day - 1]; l != NULL; l = l->next) { - GcalWeekViewChild *child; + GtkWidget *event; - child = (GcalWeekViewChild*) l->data; - - if (g_strcmp0 ( - gcal_event_widget_peek_uuid (GCAL_EVENT_WIDGET (widget)), - gcal_event_widget_peek_uuid (GCAL_EVENT_WIDGET (child->widget))) == 0) + event = GTK_WIDGET (((GcalWeekViewChild*) l->data)->widget); + if (gcal_event_widget_equal (GCAL_EVENT_WIDGET (widget), + GCAL_EVENT_WIDGET (event))) { //TODO: remove once the main-dev phase its over g_warning ("Trying to add an event with the same uuid to the view"); + g_object_unref (widget); /* FIXME: check if this destroy it */ return; } } diff --git a/src/gcal-year-view.c b/src/gcal-year-view.c index 0522dc09..880b5a0b 100644 --- a/src/gcal-year-view.c +++ b/src/gcal-year-view.c @@ -622,16 +622,15 @@ gcal_year_view_add (GtkContainer *container, for (l = priv->months[date->month - 1]; l != NULL; l = l->next) { - GcalViewChild *child; + GtkWidget *event; - child = (GcalViewChild*) l->data; - if (g_strcmp0 ( - gcal_event_widget_peek_uuid (GCAL_EVENT_WIDGET (widget)), - gcal_event_widget_peek_uuid (GCAL_EVENT_WIDGET (child->widget))) - == 0) + event = GTK_WIDGET (((GcalViewChild*) l->data)->widget); + if (gcal_event_widget_equal (GCAL_EVENT_WIDGET (widget), + GCAL_EVENT_WIDGET (event))) { //TODO: remove once the main-dev phase its over g_warning ("Trying to add an event with the same uuid to the view"); + g_object_unref (widget); /* FIXME: check if this destroy it */ return; } }