[gupnp] service: Remove constructor
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gupnp] service: Remove constructor
- Date: Sat, 20 Nov 2021 17:52:40 +0000 (UTC)
commit b77d9734101b4dbccd8cfb56a04e0ce52d119ec1
Author: Jens Georg <mail jensge org>
Date: Sat Nov 20 18:44:19 2021 +0100
service: Remove constructor
There is no need to do the actions in the constructor, doing it in
constructed is early enough.
Ideally we would even be a GAsyncInitable and wait for the introspection
to finish. That way a whole lot of code in subscription handling etc.
could be just omitted, but this requires chainging API quite intrusively
and shall be done for 2.0 API release.
libgupnp/gupnp-service.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
---
diff --git a/libgupnp/gupnp-service.c b/libgupnp/gupnp-service.c
index 1eeb96f..8ce7222 100644
--- a/libgupnp/gupnp-service.c
+++ b/libgupnp/gupnp-service.c
@@ -936,13 +936,10 @@ path_from_url (const char *url)
return path;
}
-static GObject *
-gupnp_service_constructor (GType type,
- guint n_construct_params,
- GObjectConstructParam *construct_params)
+static void
+gupnp_service_constructed (GObject *object)
{
GObjectClass *object_class;
- GObject *object;
GUPnPServiceInfo *info;
GUPnPContext *context;
AclServerHandler *handler;
@@ -952,9 +949,7 @@ gupnp_service_constructor (GType type,
object_class = G_OBJECT_CLASS (gupnp_service_parent_class);
/* Construct */
- object = object_class->constructor (type,
- n_construct_params,
- construct_params);
+ object_class->constructed (object);
info = GUPNP_SERVICE_INFO (object);
@@ -989,8 +984,6 @@ gupnp_service_constructor (GType type,
_gupnp_context_add_server_handler_with_data (context, path, handler);
g_free (path);
g_free (url);
-
- return object;
}
/* Root device availability changed. */
@@ -1165,7 +1158,7 @@ gupnp_service_class_init (GUPnPServiceClass *klass)
object_class->set_property = gupnp_service_set_property;
object_class->get_property = gupnp_service_get_property;
- object_class->constructor = gupnp_service_constructor;
+ object_class->constructed = gupnp_service_constructed;
object_class->dispose = gupnp_service_dispose;
object_class->finalize = gupnp_service_finalize;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]