From 11b99527b51c112139c55168566e189ba4be3f01 Mon Sep 17 00:00:00 2001
From: George Kiagiadakis <george.kiagiadakis@collabora.com>
Date: Fri, 8 May 2020 17:12:31 +0300
Subject: [PATCH] core: make the properties on wp_core_new to be (transfer
full)
This aligns better with the general design of consuming property
objects on constructors, both in PipeWire and WirePlumber APIs
---
lib/wp/core.c | 3 ++-
tests/common/base-test-fixture.h | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/wp/core.c b/lib/wp/core.c
index a892afcb..193c4447 100644
--- a/lib/wp/core.c
+++ b/lib/wp/core.c
@@ -339,7 +339,7 @@ wp_core_class_init (WpCoreClass * klass)
/**
* wp_core_new:
* @context: (transfer none) (nullable): the #GMainContext to use for events
- * @properties: (transfer none) (nullable): additional properties, which are
+ * @properties: (transfer full) (nullable): additional properties, which are
* passed to `pw_context_new` and `pw_context_connect`
*
* Returns: (transfer full): a new #WpCore
@@ -347,6 +347,7 @@ wp_core_class_init (WpCoreClass * klass)
WpCore *
wp_core_new (GMainContext *context, WpProperties * properties)
{
+ g_autoptr (WpProperties) props = properties;
return g_object_new (WP_TYPE_CORE,
"context", context,
"properties", properties,
diff --git a/tests/common/base-test-fixture.h b/tests/common/base-test-fixture.h
index 21786ad1..a0aa4fcb 100644
--- a/tests/common/base-test-fixture.h
+++ b/tests/common/base-test-fixture.h
@@ -77,7 +77,7 @@ wp_base_test_fixture_setup (WpBaseTestFixture * self, WpBaseTestFlags flags)
/* init our core */
props = wp_properties_new (PW_KEY_REMOTE_NAME, self->server.name, NULL);
- self->core = wp_core_new (self->context, props);
+ self->core = wp_core_new (self->context, wp_properties_ref (props));
g_signal_connect (self->core, "disconnected",
(GCallback) disconnected_callback, self);
@@ -86,7 +86,7 @@ wp_base_test_fixture_setup (WpBaseTestFixture * self, WpBaseTestFlags flags)
/* init the second client's core */
if (flags & WP_BASE_TEST_FLAG_CLIENT_CORE) {
- self->client_core = wp_core_new (self->context, props);
+ self->client_core = wp_core_new (self->context, wp_properties_ref (props));
g_signal_connect (self->client_core, "disconnected",
(GCallback) disconnected_callback, self);
--
GitLab