From 5616ba2c035d183b3236c808272e902d5006d33d Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 22 Feb 2026 10:44:47 -0500 Subject: [PATCH] views/agenda-view: Replace "context" property with context getter method Part-of: --- src/gui/gcal-window.c | 1 - src/gui/views/gcal-agenda-view.c | 21 ++++----------------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/src/gui/gcal-window.c b/src/gui/gcal-window.c index 68192240..16dde263 100644 --- a/src/gui/gcal-window.c +++ b/src/gui/gcal-window.c @@ -1225,7 +1225,6 @@ gcal_window_constructed (GObject *object) * FIXME: this is a hack around the issue that happens when trying to bind * these properties using the GtkBuilder .ui file. */ - g_object_bind_property (self, "context", self->agenda_view, "context", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE); g_object_bind_property (self, "context", self->date_chooser, "context", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE); g_object_bind_property (self, "context", self->event_editor, "context", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE); g_object_bind_property (self, "context", self->quick_add_popover, "context", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE); diff --git a/src/gui/views/gcal-agenda-view.c b/src/gui/views/gcal-agenda-view.c index 42f4ebb1..b2a9afb8 100644 --- a/src/gui/views/gcal-agenda-view.c +++ b/src/gui/views/gcal-agenda-view.c @@ -49,7 +49,6 @@ struct _GcalAgendaView /* property */ GDateTime *date; - GcalContext *context; GcalRangeTree *events; guint scroll_grid_timeout_id; @@ -69,7 +68,6 @@ enum { PROP_0, PROP_DATE, - PROP_CONTEXT, PROP_TIME_DIRECTION, N_PROPS, }; @@ -603,6 +601,7 @@ gcal_agenda_view_add_event (GcalTimelineSubscriber *subscriber, g_autoptr (GDateTime) event_date = gcal_event_get_date_start (event); GtkWidget *widget, *row; GcalTimestampPolicy timestamp_policy; + GcalContext *context; GCAL_ENTRY; @@ -624,8 +623,10 @@ gcal_agenda_view_add_event (GcalTimelineSubscriber *subscriber, else timestamp_policy = GCAL_TIMESTAMP_POLICY_START; + context = gcal_application_get_context (GCAL_DEFAULT_APPLICATION); + widget = g_object_new (GCAL_TYPE_EVENT_WIDGET, - "context", self->context, + "context", context, "event", event, "orientation", GTK_ORIENTATION_VERTICAL, "timestamp-policy", timestamp_policy, @@ -752,8 +753,6 @@ gcal_agenda_view_finalize (GObject *object) g_clear_pointer (&self->date, g_date_time_unref); - g_clear_object (&self->context); - /* Chain up to parent's finalize() method. */ G_OBJECT_CLASS (gcal_agenda_view_parent_class)->finalize (object); } @@ -764,19 +763,12 @@ gcal_agenda_view_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GcalAgendaView *self = (GcalAgendaView *) object; - switch (property_id) { case PROP_DATE: gcal_view_set_date (GCAL_VIEW (object), g_value_get_boxed (value)); break; - case PROP_CONTEXT: - g_assert (self->context == NULL); - self->context = g_value_dup_object (value); - break; - default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -800,10 +792,6 @@ gcal_agenda_view_get_property (GObject *object, g_value_set_boxed (value, self->date); break; - case PROP_CONTEXT: - g_value_set_object (value, self->context); - break; - case PROP_TIME_DIRECTION: g_value_set_enum (value, GTK_ORIENTATION_VERTICAL); break; @@ -826,7 +814,6 @@ gcal_agenda_view_class_init (GcalAgendaViewClass *klass) object_class->get_property = gcal_agenda_view_get_property; g_object_class_override_property (object_class, PROP_DATE, "active-date"); - g_object_class_override_property (object_class, PROP_CONTEXT, "context"); g_object_class_override_property (object_class, PROP_TIME_DIRECTION, "time-direction"); gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/ui/views/gcal-agenda-view.ui");