[gnome-calendar/gbsneto/range: 12/12] timeline, calendar-monitor: Remove useless event range checks
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calendar/gbsneto/range: 12/12] timeline, calendar-monitor: Remove useless event range checks
- Date: Tue, 14 Apr 2020 18:40:30 +0000 (UTC)
commit 6a10907782e38876f60f3599872f156edb1a9e61
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Tue Apr 14 15:16:34 2020 -0300
timeline, calendar-monitor: Remove useless event range checks
GcalRange is now smart enough to compare correctly with other ranges.
src/core/gcal-calendar-monitor.c | 9 ---------
src/core/gcal-timeline.c | 17 -----------------
2 files changed, 26 deletions(-)
---
diff --git a/src/core/gcal-calendar-monitor.c b/src/core/gcal-calendar-monitor.c
index 7586417e..2699cdca 100644
--- a/src/core/gcal-calendar-monitor.c
+++ b/src/core/gcal-calendar-monitor.c
@@ -357,9 +357,6 @@ on_client_view_objects_added_cb (ECalClientView *view,
continue;
}
- if (!gcal_event_is_within_range (event, range))
- continue;
-
event_id = g_strdup (gcal_event_get_uid (event));
if (!self->monitor_thread.populated)
@@ -446,9 +443,6 @@ on_client_view_objects_added_cb (ECalClientView *view,
if (g_cancellable_is_cancelled (self->cancellable))
return;
- if (!gcal_event_is_within_range (event, range))
- continue;
-
event_id = g_strdup (gcal_event_get_uid (event));
if (!self->monitor_thread.populated)
@@ -836,9 +830,6 @@ remove_events_outside_range (GcalCalendarMonitor *self,
g_hash_table_iter_init (&iter, self->events);
while (g_hash_table_iter_next (&iter, NULL, (gpointer*) &event))
{
- if (range && gcal_event_is_within_range (event, range))
- continue;
-
g_object_ref (event);
g_hash_table_iter_remove (&iter);
diff --git a/src/core/gcal-timeline.c b/src/core/gcal-timeline.c
index 0501e839..51df47b7 100644
--- a/src/core/gcal-timeline.c
+++ b/src/core/gcal-timeline.c
@@ -192,17 +192,6 @@ remove_event_from_subscriber (GcalTimelineSubscriber *subscriber,
GCAL_TIMELINE_SUBSCRIBER_GET_IFACE (subscriber)->remove_event (subscriber, event);
}
-static gboolean
-subscriber_contains_event (GcalTimelineSubscriber *subscriber,
- GcalEvent *event)
-{
- g_autoptr (GcalRange) subscriber_range = NULL;
-
- subscriber_range = gcal_timeline_subscriber_get_range (subscriber);
-
- return gcal_event_is_within_range (event, subscriber_range);
-}
-
static void
update_range (GcalTimeline *self)
{
@@ -617,9 +606,6 @@ timeline_source_dispatch (GSource *source,
{
GcalTimelineSubscriber *subscriber = g_ptr_array_index (queue_data->subscribers, i);
- if (!subscriber_contains_event (subscriber, event))
- continue;
-
add_event_to_subscriber (subscriber, event);
}
break;
@@ -645,9 +631,6 @@ timeline_source_dispatch (GSource *source,
{
GcalTimelineSubscriber *subscriber = g_ptr_array_index (queue_data->subscribers, i);
- if (!subscriber_contains_event (subscriber, event))
- continue;
-
update_subscriber_event (subscriber, event);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]