From 05c062fc80d5869527d7b5116c95253e4cc0c95c Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Thu, 7 Oct 2021 18:27:24 +0200 Subject: [PATCH] libnm-utils: let nml_dbus_property_ao_clear() return changed_prop Signed-off-by: Fernando Fernandez Mancera --- src/libnm-client-impl/nm-client.c | 7 +++++-- src/libnm-client-impl/nm-libnm-utils.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/libnm-client-impl/nm-client.c b/src/libnm-client-impl/nm-client.c index 70af1ae730..536211da6e 100644 --- a/src/libnm-client-impl/nm-client.c +++ b/src/libnm-client-impl/nm-client.c @@ -2266,9 +2266,11 @@ nml_dbus_property_ao_notify(NMClient * self, return NML_DBUS_NOTIFY_UPDATE_PROP_FLAGS_NONE; } -void +gboolean nml_dbus_property_ao_clear(NMLDBusPropertyAO *pr_ao, NMClient *self) { + gboolean changed_prop = FALSE; + _ASSERT_pr_ao(pr_ao); if (!pr_ao->owner_dbobj) { @@ -2281,7 +2283,6 @@ nml_dbus_property_ao_clear(NMLDBusPropertyAO *pr_ao, NMClient *self) nm_assert(!pr_ao->is_changed); } else { PropertyAOData *pr_ao_data; - gboolean changed_prop = FALSE; nm_assert(NM_IS_CLIENT(self)); nm_assert(pr_ao->data_lst_head.next); @@ -2329,6 +2330,8 @@ nml_dbus_property_ao_clear(NMLDBusPropertyAO *pr_ao, NMClient *self) } nm_clear_pointer(&pr_ao->arr, g_ptr_array_unref); + + return changed_prop; } void diff --git a/src/libnm-client-impl/nm-libnm-utils.h b/src/libnm-client-impl/nm-libnm-utils.h index 34faeb0117..73766ed6d6 100644 --- a/src/libnm-client-impl/nm-libnm-utils.h +++ b/src/libnm-client-impl/nm-libnm-utils.h @@ -303,7 +303,7 @@ const GPtrArray *nml_dbus_property_ao_get_objs_as_ptrarray(NMLDBusPropertyAO *pr gboolean nml_dbus_property_ao_is_ready(const NMLDBusPropertyAO *pr_ao); -void nml_dbus_property_ao_clear(NMLDBusPropertyAO *pr_ao, NMClient *client); +gboolean nml_dbus_property_ao_clear(NMLDBusPropertyAO *pr_ao, NMClient *client); void nml_dbus_property_ao_clear_many(NMLDBusPropertyAO *pr_ao, guint len, NMClient *self);