New upstream version 1.34.0 upstream/1.34.0

1 files changed, 21 insertions, 4 deletions

diff --git a/src/libnm-client-impl/nm-client.c b/src/libnm-client-impl/nm-client.c
index 4cbd56dc..0f9d8fe1 100644
--- a/src/libnm-client-impl/nm-client.c
+++ b/src/libnm-client-impl/nm-client.c
@@ -2118,7 +2118,7 @@ nml_dbus_property_ao_notify_watch_cb(NMClient *self, gpointer obj_watcher)
     _ASSERT_pr_ao(pr_ao);
 }
 
-static NMLDBusNotifyUpdatePropFlags
+NMLDBusNotifyUpdatePropFlags
 nml_dbus_property_ao_notify(NMClient *              self,
                             NMLDBusPropertyAO *     pr_ao,
                             NMLDBusObject *         dbobj,
@@ -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
@@ -2404,7 +2407,7 @@ _obj_handle_dbus_prop_changes(NMClient *           self,
         value = NULL;
     }
 
-    if (meta_property->use_notify_update_prop) {
+    if (meta_property->notify_update_prop) {
         notify_update_prop_flags =
             meta_property->notify_update_prop(self, dbobj, meta_iface, dbus_property_idx, value);
         if (notify_update_prop_flags == NML_DBUS_NOTIFY_UPDATE_PROP_FLAGS_NONE)
@@ -8832,3 +8835,17 @@ NM_BACKPORT_SYMBOL(libnm_1_10_14,
                    (NMSettingConnection * setting),
                    (setting));
 NM_BACKPORT_SYMBOL(libnm_1_10_14, GType, nm_setting_connection_mdns_get_type, (void), ());
+
+NM_BACKPORT_SYMBOL(libnm_1_30_8,
+                   int,
+                   nm_setting_ip_config_get_required_timeout,
+                   (NMSettingIPConfig * setting),
+                   (setting));
+
+NM_BACKPORT_SYMBOL(libnm_1_30_8,
+                   NMIPAddress *,
+                   nm_ip_address_dup,
+                   (NMIPAddress * address),
+                   (address));
+
+NM_BACKPORT_SYMBOL(libnm_1_30_8, NMIPRoute *, nm_ip_route_dup, (NMIPRoute * route), (route));