From 88c227d90a6b7b388c5c85d72802a0ca8f05ed5c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 13 Jan 2022 22:30:39 +0100 Subject: New upstream version 1.34.0 --- src/libnm-client-impl/nm-object.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'src/libnm-client-impl/nm-object.c') diff --git a/src/libnm-client-impl/nm-object.c b/src/libnm-client-impl/nm-object.c index 2e7de8c2..ae48853b 100644 --- a/src/libnm-client-impl/nm-object.c +++ b/src/libnm-client-impl/nm-object.c @@ -21,7 +21,7 @@ /*****************************************************************************/ -NM_GOBJECT_PROPERTIES_DEFINE_BASE(PROP_PATH, ); +NM_GOBJECT_PROPERTIES_DEFINE_BASE(PROP_PATH, PROP_CLIENT, ); typedef struct _NMObjectPrivate { NMClient * client; @@ -215,6 +215,8 @@ unregister_client(NMObject *self, NMClient *client, NMLDBusObject *dbobj) nm_assert(priv->client == client); priv->client = NULL; + _nm_client_queue_notify_object(client, self, obj_properties[PROP_CLIENT]); + clear_properties(self, client); } @@ -229,6 +231,9 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) case PROP_PATH: g_value_set_string(value, nm_object_get_path(self)); break; + case PROP_CLIENT: + g_value_set_object(value, nm_object_get_client(self)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); break; @@ -300,6 +305,10 @@ nm_object_class_init(NMObjectClass *klass) * NMObject:path: * * The D-Bus object path. + * + * The D-Bus path of an object instance never changes, even if the object + * gets removed from the cache. To see whether the object is still in the + * cache, check NMObject:client. **/ obj_properties[PROP_PATH] = g_param_spec_string(NM_OBJECT_PATH, "", @@ -307,5 +316,23 @@ nm_object_class_init(NMObjectClass *klass) NULL, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + /** + * NMObject:client: + * + * The NMClient instance as returned by nm_object_get_client(). + * + * When an NMObject gets removed from the NMClient cache, + * the NMObject:path property stays unchanged, but this client + * instance gets reset to %NULL. You can use this property to + * track removal of the object from the cache. + * + * Since: 1.34 + **/ + obj_properties[PROP_CLIENT] = g_param_spec_object(NM_OBJECT_CLIENT, + "", + "", + NM_TYPE_CLIENT, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties); } -- cgit 1.3.0-6-gf8a5