From 7320075e2d58dcd8d7ed903044aa9cc48996b37f Mon Sep 17 00:00:00 2001 From: Teemu Ikonen Date: Tue, 11 Jan 2022 11:48:59 +0200 Subject: service-manager: Add on_client_info_new_ready_data_free() Move the definition of OnClientInfoNewReadyData to the start of the file and add function on_client_info_new_ready_data_free to make using OnClientInfoNewReadyData with GLib containers easier. --- src/gclue-service-manager.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/gclue-service-manager.c b/src/gclue-service-manager.c index 016cd3f..69fba51 100644 --- a/src/gclue-service-manager.c +++ b/src/gclue-service-manager.c @@ -73,6 +73,21 @@ enum static GParamSpec *gParamSpecs[LAST_PROP]; +typedef struct +{ + GClueDBusManager *manager; + GDBusMethodInvocation *invocation; + GClueClientInfo *client_info; + gboolean reuse_client; + +} OnClientInfoNewReadyData; + +static void +on_client_info_new_ready_data_free (gpointer data) +{ + g_slice_free (OnClientInfoNewReadyData, data); +} + static void sync_in_use_property (GClueServiceManager *manager) { @@ -163,15 +178,6 @@ on_peer_vanished (GClueClientInfo *info, (char *) bus_name); } -typedef struct -{ - GClueDBusManager *manager; - GDBusMethodInvocation *invocation; - GClueClientInfo *client_info; - gboolean reuse_client; - -} OnClientInfoNewReadyData; - static gboolean complete_get_client (OnClientInfoNewReadyData *data) { @@ -253,7 +259,7 @@ error_out: out: g_clear_error (&error); g_clear_object (&info); - g_slice_free (OnClientInfoNewReadyData, data); + on_client_info_new_ready_data_free (data); g_free (path); return FALSE; -- cgit v1.2.1