diff --git a/src/gcal-month-view.c b/src/gcal-month-view.c index ae4823d6..d067e378 100644 --- a/src/gcal-month-view.c +++ b/src/gcal-month-view.c @@ -128,10 +128,6 @@ static GtkWidget* gcal_month_view_get_by_uuid (GcalView *vie const gchar *uuid); /* Review API */ -static void gcal_month_view_remove_by_uuid (GcalView *view, - const gchar *uuid); - - static void gcal_month_view_reposition_child (GcalView *view, const gchar *uuid); @@ -1286,35 +1282,6 @@ gcal_month_view_get_by_uuid (GcalView *view, return NULL; } -static void -gcal_month_view_remove_by_uuid (GcalView *view, - const gchar *uuid) -{ - GcalMonthViewPrivate *priv; - gint i; - GList *l; - - g_return_if_fail (GCAL_IS_MONTH_VIEW (view)); - priv = GCAL_MONTH_VIEW (view)->priv; - - for (i = 0; i < 31; i++) - { - for (l = priv->days[i]; l != NULL; l = l->next) - { - GcalViewChild *child; - const gchar* widget_uuid; - - child = (GcalViewChild*) l->data; - widget_uuid = gcal_event_widget_peek_uuid (GCAL_EVENT_WIDGET (child->widget)); - if (g_strcmp0 (uuid, widget_uuid) == 0) - { - gtk_widget_destroy (child->widget); - return; - } - } - } -} - static void gcal_month_view_reposition_child (GcalView *view, const gchar *uuid) @@ -1365,7 +1332,7 @@ gcal_month_view_reposition_child (GcalView *view, } else { - gcal_month_view_remove_by_uuid (view, uuid); + gtk_widget_destroy (gcal_month_view_get_by_uuid (view, uuid)); } g_free (date); diff --git a/src/gcal-week-view.c b/src/gcal-week-view.c index 669e08fb..09ae3923 100644 --- a/src/gcal-week-view.c +++ b/src/gcal-week-view.c @@ -152,9 +152,6 @@ static icaltimetype* gcal_week_view_get_final_date (GcalView *view static gboolean gcal_week_view_contains_date (GcalView *view, icaltimetype *date); -static void gcal_week_view_remove_by_uuid (GcalView *view, - const gchar *uuid); - static GtkWidget* gcal_week_view_get_by_uuid (GcalView *view, const gchar *uuid); @@ -1522,36 +1519,6 @@ gcal_week_view_contains_date (GcalView *view, } } -static void -gcal_week_view_remove_by_uuid (GcalView *view, - const gchar *uuid) -{ - GcalWeekViewPrivate *priv; - gint i; - GList *l; - - g_return_if_fail (GCAL_IS_WEEK_VIEW (view)); - priv = GCAL_WEEK_VIEW (view)->priv; - - for (i = 0; i < 7; i++) - { - for (l = priv->days[i]; l != NULL; l = l->next) - { - GcalWeekViewChild *child; - const gchar* widget_uuid; - - child = (GcalWeekViewChild*) l->data; - widget_uuid = gcal_event_widget_peek_uuid (GCAL_EVENT_WIDGET (child->widget)); - if (g_strcmp0 (uuid, widget_uuid) == 0) - { - gtk_widget_destroy (child->widget); - i = 8; - break; - } - } - } -} - static GtkWidget* gcal_week_view_get_by_uuid (GcalView *view, const gchar *uuid) diff --git a/src/gcal-year-view.c b/src/gcal-year-view.c index 2f486556..635fe865 100644 --- a/src/gcal-year-view.c +++ b/src/gcal-year-view.c @@ -118,12 +118,10 @@ static icaltimetype* gcal_year_view_get_final_date (GcalView static gboolean gcal_year_view_contains_date (GcalView *view, icaltimetype *date); -static void gcal_year_view_remove_by_uuid (GcalView *view, - const gchar *uuid); - static GtkWidget* gcal_year_view_get_by_uuid (GcalView *view, const gchar *uuid); +/* Review API */ static void gcal_year_view_reposition_child (GcalView *view, const gchar *uuid); @@ -1039,35 +1037,6 @@ gcal_year_view_contains_date (GcalView *view, return priv->date->year == date->year; } -static void -gcal_year_view_remove_by_uuid (GcalView *view, - const gchar *uuid) -{ - GcalYearViewPrivate *priv; - gint i; - GList *l; - - g_return_if_fail (GCAL_IS_YEAR_VIEW (view)); - priv = GCAL_YEAR_VIEW (view)->priv; - - for (i = 0; i < 12; i++) - { - for (l = priv->months[i]; l != NULL; l = l->next) - { - GcalViewChild *child; - const gchar* widget_uuid; - - child = (GcalViewChild*) l->data; - widget_uuid = gcal_event_widget_peek_uuid (GCAL_EVENT_WIDGET (child->widget)); - if (g_strcmp0 (uuid, widget_uuid) == 0) - { - gtk_widget_destroy (child->widget); - return; - } - } - } -} - static GtkWidget* gcal_year_view_get_by_uuid (GcalView *view, const gchar *uuid) @@ -1145,7 +1114,7 @@ gcal_year_view_reposition_child (GcalView *view, } else { - gcal_year_view_remove_by_uuid (view, uuid); + gtk_widget_destroy (gcal_year_view_get_by_uuid (view, uuid)); } g_free (date);