From dc4cfe4ecf4d71727255793457cd441e500e82ca Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 1 Mar 2026 17:09:03 -0500 Subject: [PATCH] core/manager: Remove "context" property Part-of: --- src/core/gcal-context.c | 2 +- src/core/gcal-manager.c | 35 +---------------------------------- src/core/gcal-manager.h | 2 +- 3 files changed, 3 insertions(+), 36 deletions(-) diff --git a/src/core/gcal-context.c b/src/core/gcal-context.c index e108286d..f140d17c 100644 --- a/src/core/gcal-context.c +++ b/src/core/gcal-context.c @@ -163,7 +163,7 @@ gcal_context_constructed (GObject *object) G_OBJECT_CLASS (gcal_context_parent_class)->constructed (object); - self->manager = gcal_manager_new (self); + self->manager = gcal_manager_new (); self->search_engine = gcal_search_engine_new (self); } diff --git a/src/core/gcal-manager.c b/src/core/gcal-manager.c index 48ff9a4c..7cfef005 100644 --- a/src/core/gcal-manager.c +++ b/src/core/gcal-manager.c @@ -19,7 +19,6 @@ #define G_LOG_DOMAIN "GcalManager" #include "gcal-application.h" -#include "gcal-context.h" #include "gcal-debug.h" #include "gcal-manager.h" #include "gcal-timeline.h" @@ -74,8 +73,6 @@ struct _GcalManager gint clients_synchronizing; GcalTimeline *timeline; - - GcalContext *context; }; G_DEFINE_TYPE (GcalManager, gcal_manager, G_TYPE_OBJECT) @@ -83,7 +80,6 @@ G_DEFINE_TYPE (GcalManager, gcal_manager, G_TYPE_OBJECT) enum { PROP_0, - PROP_CONTEXT, PROP_DEFAULT_CALENDAR, PROP_SYNCHRONIZING, NUM_PROPS @@ -615,12 +611,6 @@ gcal_manager_finalize (GObject *object) g_clear_object (&self->timeline); - if (self->context) - { - g_object_remove_weak_pointer (G_OBJECT (self->context), (gpointer *)&self->context); - self->context = NULL; - } - g_clear_object (&self->calendars_model); g_clear_pointer (&self->clients, g_hash_table_destroy); @@ -641,12 +631,6 @@ gcal_manager_set_property (GObject *object, switch (property_id) { - case PROP_CONTEXT: - g_assert (self->context == NULL); - self->context = g_value_get_object (value); - g_object_add_weak_pointer (G_OBJECT (self->context), (gpointer *)&self->context); - break; - case PROP_DEFAULT_CALENDAR: gcal_manager_set_default_calendar (self, g_value_get_object (value)); break; @@ -674,10 +658,6 @@ gcal_manager_get_property (GObject *object, switch (property_id) { - case PROP_CONTEXT: - g_value_set_object (value, self->context); - break; - case PROP_DEFAULT_CALENDAR: g_value_set_object (value, gcal_manager_get_default_calendar (self)); break; @@ -702,17 +682,6 @@ gcal_manager_class_init (GcalManagerClass *klass) object_class->set_property = gcal_manager_set_property; object_class->get_property = gcal_manager_get_property; - /** - * GcalManager:context: - * - * The #GcalContext. - */ - 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); - /** * GcalManager:default-calendar: * @@ -772,17 +741,15 @@ gcal_manager_init (GcalManager *self) /* Public API */ /** * gcal_manager_new: - * @context: a #GcalContext * * Creates a new #GcalManager. * * Returns: (transfer full): a newly created #GcalManager */ GcalManager* -gcal_manager_new (GcalContext *context) +gcal_manager_new (void) { return g_object_new (GCAL_TYPE_MANAGER, - "context", context, NULL); } diff --git a/src/core/gcal-manager.h b/src/core/gcal-manager.h index e2dea5ce..0f3e8ce2 100644 --- a/src/core/gcal-manager.h +++ b/src/core/gcal-manager.h @@ -30,7 +30,7 @@ G_BEGIN_DECLS #define GCAL_TYPE_MANAGER (gcal_manager_get_type ()) G_DECLARE_FINAL_TYPE (GcalManager, gcal_manager, GCAL, MANAGER, GObject) -GcalManager* gcal_manager_new (GcalContext *context); +GcalManager* gcal_manager_new (void); ESource* gcal_manager_get_source (GcalManager *self, const gchar *uid);