From 417f6015c3dc8c47cf27daa59f64e0e36c521b9c Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Fri, 10 Nov 2017 19:02:08 +0100
Subject: New upstream version 1.10.0

---
 libnm/nm-object.c          | 2 +-
 libnm/nm-property-docs.xml | 2 +-
 libnm/nm-settings-docs.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'libnm')

diff --git a/libnm/nm-object.c b/libnm/nm-object.c
index ef335862..c344a08d 100644
--- a/libnm/nm-object.c
+++ b/libnm/nm-object.c
@@ -572,7 +572,7 @@ object_created (GObject *obj, const char *path, gpointer user_data)
 			object_class->object_creation_failed (odata->self, path);
 	}
 
-	odata->objects[--odata->remaining] = obj ? g_object_ref (obj) : NULL;
+	odata->objects[odata->length - odata->remaining--] = obj ? g_object_ref (obj) : NULL;
 	object_property_maybe_complete (odata->self);
 }
 
diff --git a/libnm/nm-property-docs.xml b/libnm/nm-property-docs.xml
index f2249942..36f61c08 100644
--- a/libnm/nm-property-docs.xml
+++ b/libnm/nm-property-docs.xml
@@ -270,7 +270,7 @@
   <setting name="ovs-port" description="OvsPort Link Settings" name_upper="OVS_PORT" >
     <property name="bond-downdelay" name_upper="BOND_DOWNDELAY" type="uint32" default="0" description="The time port must be inactive in order to be considered down." />
     <property name="bond-mode" name_upper="BOND_MODE" type="string" description="Bonding mode. One of &quot;active-backup&quot;, &quot;balance-slb&quot;, or &quot;balance-tcp&quot;." />
-    <property name="bond-updelay" name_upper="BOND_UPDELAY" type="uint32" default="0" description="The time port must be active befor it starts forwarding traffic." />
+    <property name="bond-updelay" name_upper="BOND_UPDELAY" type="uint32" default="0" description="The time port must be active before it starts forwarding traffic." />
     <property name="lacp" name_upper="LACP" type="string" description="LACP mode. One of &quot;active&quot;, &quot;off&quot;, or &quot;passive&quot;." />
     <property name="name" name_upper="NAME" type="string" default="ovs-port" description="The setting's name, which uniquely identifies the setting within the connection.  Each setting type has a name unique to that type, for example &quot;ppp&quot; or &quot;wireless&quot; or &quot;wired&quot;." />
     <property name="tag" name_upper="TAG" type="uint32" default="0" description="The VLAN tag in the range 0-4095." />
diff --git a/libnm/nm-settings-docs.xml b/libnm/nm-settings-docs.xml
index 0a5aa3f7..09fde86d 100644
--- a/libnm/nm-settings-docs.xml
+++ b/libnm/nm-settings-docs.xml
@@ -276,7 +276,7 @@
   <setting name="ovs-port" description="OvsPort Link Settings" name_upper="OVS_PORT" >
     <property name="bond-downdelay" name_upper="BOND_DOWNDELAY" type="uint32" default="0" description="The time port must be inactive in order to be considered down." />
     <property name="bond-mode" name_upper="BOND_MODE" type="string" description="Bonding mode. One of &quot;active-backup&quot;, &quot;balance-slb&quot;, or &quot;balance-tcp&quot;." />
-    <property name="bond-updelay" name_upper="BOND_UPDELAY" type="uint32" default="0" description="The time port must be active befor it starts forwarding traffic." />
+    <property name="bond-updelay" name_upper="BOND_UPDELAY" type="uint32" default="0" description="The time port must be active before it starts forwarding traffic." />
     <property name="lacp" name_upper="LACP" type="string" description="LACP mode. One of &quot;active&quot;, &quot;off&quot;, or &quot;passive&quot;." />
     <property name="name" name_upper="NAME" type="string" default="ovs-port" description="The setting's name, which uniquely identifies the setting within the connection.  Each setting type has a name unique to that type, for example &quot;ppp&quot; or &quot;wireless&quot; or &quot;wired&quot;." />
     <property name="tag" name_upper="TAG" type="uint32" default="0" description="The VLAN tag in the range 0-4095." />
-- 
cgit 1.3.0-6-gf8a5