From 05e4a733f2141995181a551854d5df929f084adf Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Wed, 9 Aug 2023 21:55:35 +0200
Subject: New upstream version 1.44.0

---
 .../org.freedesktop.NetworkManager.Connection.Active.xml       |  6 +++---
 .../org.freedesktop.NetworkManager.Settings.Connection.xml     |  4 ++++
 introspection/org.freedesktop.NetworkManager.Settings.xml      | 10 ++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'introspection')

diff --git a/introspection/org.freedesktop.NetworkManager.Connection.Active.xml b/introspection/org.freedesktop.NetworkManager.Connection.Active.xml
index faab73a0..36f989af 100644
--- a/introspection/org.freedesktop.NetworkManager.Connection.Active.xml
+++ b/introspection/org.freedesktop.NetworkManager.Connection.Active.xml
@@ -164,7 +164,7 @@
 
     <!--
         Controller:
-        @Since: 1.44, 1.42.2
+        @Since: 1.44
 
         The path to the controller device if the connection is a port. This
         property replaces the deprecated 'Master' property.
@@ -176,8 +176,8 @@
 
         The path to the controller device if the connection is a port.
 
-        This property is deprecated in favor of the 'Controller'
-        property since 1.44 and 1.42.2.
+        DEPRECATED. This property is deprecated in favor of the 'Controller'
+        property since 1.44.
     -->
     <property name="Master" type="o" access="read"/>
 
diff --git a/introspection/org.freedesktop.NetworkManager.Settings.Connection.xml b/introspection/org.freedesktop.NetworkManager.Settings.Connection.xml
index a9240ec1..9b876e75 100644
--- a/introspection/org.freedesktop.NetworkManager.Settings.Connection.xml
+++ b/introspection/org.freedesktop.NetworkManager.Settings.Connection.xml
@@ -164,6 +164,10 @@
           <listitem><para>The settings plugin the connection will be migrated to
           such as "keyfile" or "ifcfg-rh".</para>
           <para role="since">Since 1.38</para></listitem>
+          <term><literal>version-id</literal>:</term>
+          <listitem><para>If specified, the update request is rejected if the
+          profile's version-id does not match. This can be used to catch concurrent
+          modifications. Zero means no version check.</para><para role="since">Since 1.44</para></listitem>
         </varlistentry>
         </variablelist>
 
diff --git a/introspection/org.freedesktop.NetworkManager.Settings.xml b/introspection/org.freedesktop.NetworkManager.Settings.xml
index ea271dfa..2932734f 100644
--- a/introspection/org.freedesktop.NetworkManager.Settings.xml
+++ b/introspection/org.freedesktop.NetworkManager.Settings.xml
@@ -188,6 +188,16 @@
     -->
     <property name="CanModify" type="b" access="read"/>
 
+    <!--
+        VersionId:
+
+        The version of the settings. This is incremented whenever the profile
+        changes and can be used to detect concurrent modifications.
+
+        Since: 1.44
+    -->
+    <property name="VersionId" type="t" access="read"/>
+
     <!--
         NewConnection:
         @connection: Object path of the new connection.
-- 
cgit 1.3.0-6-gf8a5