From 4e9ea9cd512284bfe6c205a7c2c05ffbb362c7fd Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 1 Mar 2026 17:07:23 -0500 Subject: [PATCH] core/timeline: Remove "context" property Part-of: --- src/core/gcal-manager.c | 2 +- src/core/gcal-shell-search-provider.c | 2 +- src/core/gcal-timeline.c | 29 ++------------------------- src/core/gcal-timeline.h | 2 +- src/search/gcal-search-engine.c | 2 +- 5 files changed, 6 insertions(+), 31 deletions(-) diff --git a/src/core/gcal-manager.c b/src/core/gcal-manager.c index c467de86..48ff9a4c 100644 --- a/src/core/gcal-manager.c +++ b/src/core/gcal-manager.c @@ -1289,7 +1289,7 @@ gcal_manager_startup (GcalManager *self) GCAL_ENTRY; - self->timeline = gcal_timeline_new (self->context); + self->timeline = gcal_timeline_new (); self->clients = g_hash_table_new_full ((GHashFunc) e_source_hash, (GEqualFunc) e_source_equal, g_object_unref, diff --git a/src/core/gcal-shell-search-provider.c b/src/core/gcal-shell-search-provider.c index ba68df61..6e8d6978 100644 --- a/src/core/gcal-shell-search-provider.c +++ b/src/core/gcal-shell-search-provider.c @@ -523,7 +523,7 @@ gcal_shell_search_provider_set_property (GObject *object, g_assert (self->context == NULL); self->context = g_value_get_object (value); - self->timeline = gcal_timeline_new (self->context); + self->timeline = gcal_timeline_new (); g_signal_connect (self->timeline, "notify::complete", G_CALLBACK (on_timeline_completed_cb), self); manager = gcal_context_get_manager (self->context); diff --git a/src/core/gcal-timeline.c b/src/core/gcal-timeline.c index 49095604..df8487f1 100644 --- a/src/core/gcal-timeline.c +++ b/src/core/gcal-timeline.c @@ -22,13 +22,13 @@ #include "gcal-calendar.h" #include "gcal-calendar-monitor.h" -#include "gcal-context.h" #include "gcal-date-time-utils.h" #include "gcal-debug.h" #include "gcal-event.h" #include "gcal-range-tree.h" #include "gcal-timeline.h" #include "gcal-timeline-subscriber.h" +#include "gcal-utils.h" #include @@ -80,8 +80,6 @@ struct _GcalTimeline GHashTable *queued_adds; GQueue *event_queue; GSource *timeline_source; - - GcalContext *context; }; G_DEFINE_TYPE (GcalTimeline, gcal_timeline, G_TYPE_OBJECT) @@ -90,7 +88,6 @@ enum { PROP_0, PROP_COMPLETE, - PROP_CONTEXT, PROP_FILTER, N_PROPS }; @@ -873,10 +870,6 @@ gcal_timeline_get_property (GObject *object, g_value_set_boolean (value, self->complete); break; - case PROP_CONTEXT: - g_value_set_object (value, self->context); - break; - case PROP_FILTER: g_value_set_string (value, self->filter); break; @@ -896,11 +889,6 @@ gcal_timeline_set_property (GObject *object, switch (prop_id) { - case PROP_CONTEXT: - g_assert (self->context == NULL); - self->context = g_value_get_object (value); - break; - case PROP_FILTER: gcal_timeline_set_filter (self, g_value_get_string (value)); break; @@ -930,17 +918,6 @@ gcal_timeline_class_init (GcalTimelineClass *klass) FALSE, G_PARAM_READABLE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS); - /** - * GcalSearchEngine::context: - * - * The #GcalContext of the application. - */ - properties[PROP_CONTEXT] = g_param_spec_object ("context", - "Data context", - "Data context", - GCAL_TYPE_CONTEXT, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS); - /** * GcalTimeline::filter: * @@ -980,17 +957,15 @@ gcal_timeline_init (GcalTimeline *self) /** * gcal_timeline_new: - * @context: a #GcalContext * * Creates a new #GcalTimeline. * * Returns: (transfer full): a #GcalTimeline */ GcalTimeline* -gcal_timeline_new (GcalContext *context) +gcal_timeline_new (void) { return g_object_new (GCAL_TYPE_TIMELINE, - "context", context, NULL); } diff --git a/src/core/gcal-timeline.h b/src/core/gcal-timeline.h index 6d088330..f7fa10a0 100644 --- a/src/core/gcal-timeline.h +++ b/src/core/gcal-timeline.h @@ -29,7 +29,7 @@ G_BEGIN_DECLS #define GCAL_TYPE_TIMELINE (gcal_timeline_get_type()) G_DECLARE_FINAL_TYPE (GcalTimeline, gcal_timeline, GCAL, TIMELINE, GObject) -GcalTimeline* gcal_timeline_new (GcalContext *context); +GcalTimeline* gcal_timeline_new (void); void gcal_timeline_add_calendar (GcalTimeline *self, GcalCalendar *calendar); diff --git a/src/search/gcal-search-engine.c b/src/search/gcal-search-engine.c index ea8bbd98..be66987d 100644 --- a/src/search/gcal-search-engine.c +++ b/src/search/gcal-search-engine.c @@ -124,7 +124,7 @@ gcal_search_engine_constructed (GObject *object) G_OBJECT_CLASS (gcal_search_engine_parent_class)->constructed (object); /* Setup the data model */ - self->timeline = gcal_timeline_new (self->context); + self->timeline = gcal_timeline_new (); manager = gcal_context_get_manager (self->context); g_signal_connect_object (manager, "calendar-added", G_CALLBACK (on_manager_calendar_added_cb), self, 0);