From 170bed7755e70ffe0345558c9228e0001bbcefb0 Mon Sep 17 00:00:00 2001
From: Hari Rana <theevilskeleton@riseup.net>
Date: Sun, 1 Mar 2026 16:37:41 -0500
Subject: [PATCH] gui/event-popover: Replace "context" property with context
 getter method

Part-of: <https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/702>
---
 src/gui/gcal-event-popover.c | 42 ++++++++++--------------------------
 src/gui/gcal-event-popover.h |  3 +--
 src/gui/gcal-event-widget.c  |  3 +--
 3 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/src/gui/gcal-event-popover.c b/src/gui/gcal-event-popover.c
index aa92450b..74bea2f7 100644
--- a/src/gui/gcal-event-popover.c
+++ b/src/gui/gcal-event-popover.c
@@ -44,7 +44,6 @@ struct _GcalEventPopover
   GtkLabel           *summary_label;
   GtkImage           *read_only_icon;
 
-  GcalContext        *context;
   GcalEvent          *event;
 };
 
@@ -57,7 +56,6 @@ G_DEFINE_TYPE (GcalEventPopover, gcal_event_popover, GTK_TYPE_POPOVER)
 enum
 {
   PROP_0,
-  PROP_CONTEXT,
   PROP_EVENT,
   N_PROPS
 };
@@ -100,9 +98,10 @@ static gchar*
 format_time (GcalEventPopover *self,
              GDateTime        *date)
 {
+  GcalContext *context = gcal_application_get_context (GCAL_DEFAULT_APPLICATION);
   GcalTimeFormat time_format;
 
-  time_format = gcal_context_get_time_format (self->context);
+  time_format = gcal_context_get_time_format (context);
 
   switch (time_format)
     {
@@ -678,7 +677,6 @@ gcal_event_popover_finalize (GObject *object)
 {
   GcalEventPopover *self = (GcalEventPopover *)object;
 
-  g_clear_object (&self->context);
   g_clear_object (&self->event);
 
   G_OBJECT_CLASS (gcal_event_popover_parent_class)->finalize (object);
@@ -694,10 +692,6 @@ gcal_event_popover_get_property (GObject    *object,
 
   switch (prop_id)
     {
-    case PROP_CONTEXT:
-      g_value_set_object (value, self->context);
-      break;
-
     case PROP_EVENT:
       g_value_set_object (value, self->event);
       break;
@@ -717,16 +711,6 @@ gcal_event_popover_set_property (GObject      *object,
 
   switch (prop_id)
     {
-    case PROP_CONTEXT:
-      g_assert (self->context == NULL);
-      self->context = g_value_dup_object (value);
-      g_signal_connect_object (self->context,
-                               "notify::time-format",
-                               G_CALLBACK (on_time_format_changed_cb),
-                               self,
-                               G_CONNECT_SWAPPED);
-      break;
-
     case PROP_EVENT:
       g_assert (self->event == NULL);
       set_event_internal (self, g_value_get_object (value));
@@ -749,16 +733,6 @@ gcal_event_popover_class_init (GcalEventPopoverClass *klass)
 
   widget_class->map = gcal_event_popover_map;
 
-  /**
-   * GcalEventPopover::context:
-   *
-   * The context of the event popover.
-   */
-  properties[PROP_CONTEXT] = g_param_spec_object ("context",
-                                                  "Context",
-                                                  "Context",
-                                                  GCAL_TYPE_CONTEXT,
-                                                  G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
   /**
    * GcalEventPopover::event:
    *
@@ -802,15 +776,21 @@ gcal_event_popover_class_init (GcalEventPopoverClass *klass)
 static void
 gcal_event_popover_init (GcalEventPopover *self)
 {
+  GcalContext *context = gcal_application_get_context (GCAL_DEFAULT_APPLICATION);
+
   gtk_widget_init_template (GTK_WIDGET (self));
+
+  g_signal_connect_object (context,
+                           "notify::time-format",
+                           G_CALLBACK (on_time_format_changed_cb),
+                           self,
+                           G_CONNECT_SWAPPED);
 }
 
 GtkWidget*
-gcal_event_popover_new (GcalContext *context,
-                        GcalEvent   *event)
+gcal_event_popover_new (GcalEvent   *event)
 {
   return g_object_new (GCAL_TYPE_EVENT_POPOVER,
-                       "context", context,
                        "event", event,
                        NULL);
 }
diff --git a/src/gui/gcal-event-popover.h b/src/gui/gcal-event-popover.h
index 03f3bc7e..3dcebe99 100644
--- a/src/gui/gcal-event-popover.h
+++ b/src/gui/gcal-event-popover.h
@@ -30,7 +30,6 @@ G_BEGIN_DECLS
 #define GCAL_TYPE_EVENT_POPOVER (gcal_event_popover_get_type())
 G_DECLARE_FINAL_TYPE (GcalEventPopover, gcal_event_popover, GCAL, EVENT_POPOVER, GtkPopover)
 
-GtkWidget*           gcal_event_popover_new                      (GcalContext        *context,
-                                                                  GcalEvent          *event);
+GtkWidget*           gcal_event_popover_new                      (GcalEvent *event);
 
 G_END_DECLS
diff --git a/src/gui/gcal-event-widget.c b/src/gui/gcal-event-widget.c
index dde91efc..99603fc6 100644
--- a/src/gui/gcal-event-widget.c
+++ b/src/gui/gcal-event-widget.c
@@ -1034,7 +1034,6 @@ gcal_event_widget_show_preview (GcalEventWidget          *self,
                                 GcalEventPreviewCallback  callback,
                                 gpointer                  user_data)
 {
-  GcalContext *context = gcal_application_get_context (GCAL_DEFAULT_APPLICATION);
   PreviewData *data;
 
   GCAL_ENTRY;
@@ -1046,7 +1045,7 @@ gcal_event_widget_show_preview (GcalEventWidget          *self,
   data->callback = callback;
   data->user_data = user_data;
 
-  self->preview_popover = gcal_event_popover_new (context, self->event);
+  self->preview_popover = gcal_event_popover_new (self->event);
   g_object_add_weak_pointer (G_OBJECT (self->preview_popover), (gpointer *) &self->preview_popover);
 
   gtk_widget_set_parent (self->preview_popover, GTK_WIDGET (self));