From 79f400027117d939a1e9c93730d0335482dc9d79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erick=20P=C3=A9rez=20Castellanos?= Date: Fri, 9 Jan 2015 09:22:03 -0500 Subject: [PATCH] year-view: fix reminders of the merge --- src/gcal-year-view.c | 56 -------------------------------------------- 1 file changed, 56 deletions(-) diff --git a/src/gcal-year-view.c b/src/gcal-year-view.c index 54396f13..1136fd03 100644 --- a/src/gcal-year-view.c +++ b/src/gcal-year-view.c @@ -52,14 +52,6 @@ enum PROP_MANAGER //manager inherited property }; -static gboolean get_widget_parts (gint first_cell, - gint last_cell, - gint natural_height, - gdouble vertical_cell_space, - gdouble *size_left, - GArray *cells, - GArray *lengths); - static gboolean get_widget_parts (gint first_cell, gint last_cell, gint natural_height, @@ -128,54 +120,6 @@ G_DEFINE_TYPE_WITH_CODE (GcalYearView, gcal_year_view, GCAL_TYPE_SUBSCRIBER_VIEW G_ADD_PRIVATE (GcalYearView) G_IMPLEMENT_INTERFACE (GCAL_TYPE_VIEW,gcal_view_interface_init)); - -static gboolean -get_widget_parts (gint first_cell, - gint last_cell, - gint natural_height, - gdouble vertical_cell_space, - gdouble *size_left, - GArray *cells, - GArray *lengths) -{ - gint i; - gint current_part_length; - gdouble y, old_y = - 1.0; - - if (last_cell < first_cell) - { - gint swap = last_cell; - last_cell = first_cell; - first_cell = swap; - } - - for (i = first_cell; i <= last_cell; i++) - { - if (size_left[i] < natural_height) - { - return FALSE; - } - else - { - y = vertical_cell_space - size_left[i]; - if (y != old_y) - { - current_part_length = 1; - g_array_append_val (cells, i); - g_array_append_val (lengths, current_part_length); - old_y = y; - } - else - { - current_part_length++; - g_array_index (lengths, gint, lengths->len - 1) = current_part_length; - } - } - } - - return TRUE; -} - static gboolean get_widget_parts (gint first_cell, gint last_cell,