[gnome-calendar/wip/gbsneto/gcal-event: 13/13] event-widget: remove unecessary code

[Georges Basile Stavracas Neto <gbsneto src gnome org>]

commit 7d225917080a4a7cd7e719b0109e6c6606ed1c69
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Sun Feb 14 06:25:26 2016 -0200

    event-widget: remove unecessary code
    
    The compare_for_single_day() method is reproducing the
    same functionality from gcal_event_compare(), and the only
    consumer is the Year View. So, for now, simplify the
    comparing function and put it in year view.

 src/gcal-event-widget.c |   51 -----------------------------------------------
 src/gcal-event-widget.h |    3 --
 src/gcal-year-view.c    |   11 ++++++++-
 3 files changed, 9 insertions(+), 56 deletions(-)
---
diff --git a/src/gcal-event-widget.c b/src/gcal-event-widget.c
index 251046f..d68d0ad 100644
--- a/src/gcal-event-widget.c
+++ b/src/gcal-event-widget.c
@@ -865,54 +865,3 @@ gcal_event_widget_compare_by_start_date (GcalEventWidget *widget1,
 {
   return g_date_time_compare (widget1->dt_start, widget2->dt_start);
 }
-
-/**
- * gcal_event_widget_compare_for_single_day:
- * @widget1:
- * @widget2:
- *
- * Compare widgets by putting those that span over a day before the rest, and between those
- * who last less than a day by its start time/date
- *
- * Returns:
- **/
-gint
-gcal_event_widget_compare_for_single_day (GcalEventWidget *widget1,
-                                          GcalEventWidget *widget2)
-{
-  if (gcal_event_is_multiday (widget1->event) && gcal_event_is_multiday (widget2->event))
-    {
-      time_t time_s1, time_s2;
-      time_t time_e1, time_e2;
-      time_t result;
-
-      time_s1 = g_date_time_to_unix (widget1->dt_start);
-      time_s2 = g_date_time_to_unix (widget2->dt_start);
-      time_e1 = g_date_time_to_unix (widget1->dt_end);
-      time_e2 = g_date_time_to_unix (widget2->dt_end);
-
-      result = (time_e2 - time_s2) - (time_e1 - time_s1);
-      if (result != 0)
-        return result;
-      else
-        return g_date_time_compare (widget1->dt_start, widget2->dt_start);
-    }
-  else
-    {
-      if (gcal_event_is_multiday (widget1->event))
-        return -1;
-      else if (gcal_event_is_multiday (widget2->event))
-        return 1;
-      else
-        {
-          if (gcal_event_get_all_day (widget1->event) && gcal_event_get_all_day (widget2->event))
-            return 0;
-          else if (gcal_event_get_all_day (widget1->event))
-            return -1;
-          else if (gcal_event_get_all_day (widget2->event))
-            return 1;
-          else
-            return g_date_time_compare (widget1->dt_start, widget2->dt_start);
-        }
-    }
-}
diff --git a/src/gcal-event-widget.h b/src/gcal-event-widget.h
index d07b79f..7d23e8e 100644
--- a/src/gcal-event-widget.h
+++ b/src/gcal-event-widget.h
@@ -70,9 +70,6 @@ gint         gcal_event_widget_compare_by_length           (GcalEventWidget    *
 gint         gcal_event_widget_compare_by_start_date       (GcalEventWidget    *widget1,
                                                             GcalEventWidget    *widget2);
 
-gint         gcal_event_widget_compare_for_single_day      (GcalEventWidget    *widget1,
-                                                            GcalEventWidget    *widget2);
-
 G_END_DECLS
 
 #endif /* __GCAL_EVENT_WIDGET_H__ */
diff --git a/src/gcal-year-view.c b/src/gcal-year-view.c
index 8488654..c95253d 100644
--- a/src/gcal-year-view.c
+++ b/src/gcal-year-view.c
@@ -119,6 +119,13 @@ G_DEFINE_TYPE_WITH_CODE (GcalYearView, gcal_year_view, GTK_TYPE_BOX,
                          G_IMPLEMENT_INTERFACE (E_TYPE_CAL_DATA_MODEL_SUBSCRIBER,
                                                 gcal_data_model_subscriber_interface_init));
 
+static gint
+compare_events (GcalEventWidget *widget1,
+                GcalEventWidget *widget2)
+{
+  return gcal_event_compare (gcal_event_widget_get_event (widget1), gcal_event_widget_get_event (widget2));
+}
+
 static guint
 get_last_week_of_year_dmy (gint       first_weekday,
                            GDateDay   day,
@@ -320,7 +327,7 @@ add_event_to_day_array (GcalYearView  *year_view,
         {
           days_widgets_array[i] = g_list_insert_sorted (days_widgets_array[i],
                                                         cloned_child,
-                                                        (GCompareFunc) 
gcal_event_widget_compare_for_single_day);
+                                                        (GCompareFunc) compare_events);
 
           end_comparison = g_date_time_compare (second_date, dt_end);
 
@@ -497,7 +504,7 @@ sidebar_sort_func (GtkListBoxRow *row1,
 
   result = row1_shift - row2_shift;
   if (result == 0)
-    return gcal_event_widget_compare_for_single_day (GCAL_EVENT_WIDGET (row1_child), GCAL_EVENT_WIDGET 
(row2_child));
+    return compare_events (GCAL_EVENT_WIDGET (row1_child), GCAL_EVENT_WIDGET (row2_child));
 
   return result;
 }