From 1358831d0376fc15773e35773f8d48b8b59de717 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Fri, 18 Mar 2022 14:41:57 +0100
Subject: [PATCH] introspection: use @since

gdbus-codegen provides a way to specify a version number on various
elements. Use it to instead of a plain text paragraph.
---
 ...sktop.NetworkManager.Connection.Active.xml |  2 +-
 ...reedesktop.NetworkManager.Device.Modem.xml |  6 ++---
 ...esktop.NetworkManager.Device.OvsBridge.xml |  3 +--
 ...edesktop.NetworkManager.Device.OvsPort.xml |  3 +--
 ...edesktop.NetworkManager.Device.WifiP2P.xml | 15 +-----------
 ...desktop.NetworkManager.Device.Wireless.xml |  3 +--
 .../org.freedesktop.NetworkManager.Device.xml | 15 ++++--------
 ...g.freedesktop.NetworkManager.IP4Config.xml |  6 ++---
 ...top.NetworkManager.Settings.Connection.xml |  9 +++-----
 ...rg.freedesktop.NetworkManager.Settings.xml |  3 +--
 ...freedesktop.NetworkManager.WifiP2PPeer.xml | 23 +------------------
 .../org.freedesktop.NetworkManager.xml        |  3 +--
 12 files changed, 21 insertions(+), 70 deletions(-)

diff --git a/introspection/org.freedesktop.NetworkManager.Connection.Active.xml b/introspection/org.freedesktop.NetworkManager.Connection.Active.xml
index 54e1fd9445..fc6ff2600a 100644
--- a/introspection/org.freedesktop.NetworkManager.Connection.Active.xml
+++ b/introspection/org.freedesktop.NetworkManager.Connection.Active.xml
@@ -93,10 +93,10 @@
         StateChanged:
         @state: (<link linkend="NMActiveConnectionState">NMActiveConnectionState</link>) The new state of the active connection.
         @reason: (<link linkend="NMActiveConnectionStateReason">NMActiveConnectionStateReason</link>) Reason code describing the change to the new state.
+        @since: 1.8
 
         Emitted when the state of the active connection has changed.
 
-        Since: 1.8
     -->
     <signal name="StateChanged">
       <arg name="state" type="u"/>
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Modem.xml b/introspection/org.freedesktop.NetworkManager.Device.Modem.xml
index b089bda2de..119a998282 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Modem.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Modem.xml
@@ -30,31 +30,31 @@
 
     <!--
         DeviceId:
+        @since: 1.20
 
         An identifier used by the modem backend (ModemManager) that aims to
         uniquely identify the a device. Can be used to match a connection to a
         particular device.
 
-        Since: 1.20
     -->
     <property name="DeviceId" type="s" access="read" />
 
     <!--
         OperatorCode:
+        @since: 1.20
 
         The MCC and MNC (concatenated) of the network the modem is connected to.
         Blank if disconnected or not a 3GPP modem.
 
-        Since: 1.20
     -->
     <property name="OperatorCode" type="s" access="read" />
 
     <!--
         Apn:
+        @since: 1.20
 
         The access point name the modem is connected to. Blank if disconnected.
 
-        Since: 1.20
     -->
     <property name="Apn" type="s" access="read" />
 
diff --git a/introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml b/introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml
index 5970a59d6a..e608cf1d0e 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml
@@ -9,12 +9,11 @@
 
     <!--
         Slaves:
+        @since: 1.14
 
         DEPRECATED. Use the "Ports" property in
         "org.freedesktop.NetworkManager.Device" instead which exists since
         version NetworkManager 1.34.0.
-
-        Since: 1.14
     -->
     <property name="Slaves" type="ao" access="read"/>
 
diff --git a/introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml b/introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml
index 3cd1fa54d6..4919fdf1bd 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml
@@ -9,12 +9,11 @@
 
     <!--
         Slaves:
+        @since: 1.14
 
         DEPRECATED. Use the "Ports" property in
         "org.freedesktop.NetworkManager.Device" instead which exists since
         version NetworkManager 1.34.0.
-
-        Since: 1.14
     -->
     <property name="Slaves" type="ao" access="read"/>
 
diff --git a/introspection/org.freedesktop.NetworkManager.Device.WifiP2P.xml b/introspection/org.freedesktop.NetworkManager.Device.WifiP2P.xml
index f5e2fdceaa..5384e3f72e 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.WifiP2P.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.WifiP2P.xml
@@ -3,8 +3,7 @@
   <!--
       org.freedesktop.NetworkManager.Device.WifiP2P:
       @short_description: Wi-Fi P2P Device
-
-      Since: 1.16
+      @since: 1.16
   -->
   <interface name="org.freedesktop.NetworkManager.Device.WifiP2P">
     <annotation name="org.gtk.GDBus.C.Name" value="Device_Wifi_P2P"/>
@@ -15,8 +14,6 @@
         The active hardware address of the device.
 
         DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0.
-
-        Since: 1.16
     -->
     <property name="HwAddress" type="s" access="read"/>
 
@@ -24,8 +21,6 @@
         Peers:
 
         List of object paths of peers visible to this Wi-Fi P2P device.
-
-        Since: 1.16
     -->
     <property name="Peers" type="ao" access="read"/>
 
@@ -36,8 +31,6 @@
                   30 seconds.
 
         Start a find operation for Wi-Fi P2P peers.
-
-        Since: 1.16
     -->
     <method name="StartFind">
       <arg name="options" type="a{sv}" direction="in"/>
@@ -47,8 +40,6 @@
         StopFind:
 
         Stop an ongoing find operation again.
-
-        Since: 1.16
     -->
     <method name="StopFind">
     </method>
@@ -58,8 +49,6 @@
         @peer: The object path of the newly found access point.
 
         Emitted when a new Wi-Fi P2P peer is found by the device.
-
-        Since: 1.16
     -->
     <signal name="PeerAdded">
       <arg name="peer" type="o"/>
@@ -70,8 +59,6 @@
         @peer: The object path of the Wi-Fi P2P peer that has disappeared.
 
         Emitted when a Wi-Fi P2P peer disappears from view of the device.
-
-        Since: 1.16
     -->
     <signal name="PeerRemoved">
       <arg name="peer" type="o"/>
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml b/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml
index c57e568988..59d4ee9ee5 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml
@@ -100,11 +100,10 @@
 
     <!--
         LastScan:
+        @since: 1.12
 
         The timestamp (in CLOCK_BOOTTIME milliseconds) for the last finished network scan.
         A value of -1 means the device never scanned for access points.
-
-        Since: 1.12
     -->
     <property name="LastScan" type="x" access="read"/>
 
diff --git a/introspection/org.freedesktop.NetworkManager.Device.xml b/introspection/org.freedesktop.NetworkManager.Device.xml
index 82f127edde..b42b5478ee 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.xml
@@ -268,58 +268,53 @@
 
     <!--
         Ip4Connectivity:
+        @since: 1.16
 
         The result of the last IPv4 connectivity check.
 
-        Since: 1.16
-
         Returns: <link linkend="NMConnectivityState">NMConnectivityState</link>
     -->
     <property name="Ip4Connectivity" type="u" access="read"/>
 
     <!--
         Ip6Connectivity:
+        @since: 1.16
 
         The result of the last IPv6 connectivity check.
 
-        Since: 1.16
-
         Returns: <link linkend="NMConnectivityState">NMConnectivityState</link>
     -->
     <property name="Ip6Connectivity" type="u" access="read"/>
 
     <!--
         InterfaceFlags:
+        @since: 1.22
 
         The flags of the network interface. See
         <link linkend="NMDeviceInterfaceFlags">NMDeviceInterfaceFlags</link> for
         the currently defined flags.
-
-        Since: 1.22
     -->
     <property name="InterfaceFlags" type="u" access="read"/>
 
     <!--
         HwAddress:
+        @since: 1.24
 
         The hardware address of the device.
 
         This replaces the other 'HwAddress' properties on the device-specific D-Bus interfaces.
-
-        Since: 1.24
     -->
     <property name="HwAddress" type="s" access="read"/>
 
     <!--
         Ports:
+        @since: 1.34
 
         The port devices of the controller device.
 
         Array of object paths representing devices which are currently set as
         port of this device. This replaces the 'Slaves' properties on the
         device-specific D-Bus interfaces.
-
-        Since: 1.34
     -->
     <property name="Ports" type="ao" access="read"/>
 
diff --git a/introspection/org.freedesktop.NetworkManager.IP4Config.xml b/introspection/org.freedesktop.NetworkManager.IP4Config.xml
index ce659d71fd..75a59bddd8 100644
--- a/introspection/org.freedesktop.NetworkManager.IP4Config.xml
+++ b/introspection/org.freedesktop.NetworkManager.IP4Config.xml
@@ -61,11 +61,10 @@
 
     <!--
         NameserverData:
+        @since: 1.14
 
         The nameservers in use. Currently, only the value "address"
         is recognized (with an IP address string).
-
-        Since: 1.14
     -->
     <property name="NameserverData" type="aa{sv}" access="read"/>
 
@@ -108,10 +107,9 @@
 
     <!--
         WinsServerData:
+        @since: 1.14
 
         The Windows Internet Name Service servers associated with the connection.
-
-        Since: 1.14
     -->
     <property name="WinsServerData" type="as" access="read"/>
 
diff --git a/introspection/org.freedesktop.NetworkManager.Settings.Connection.xml b/introspection/org.freedesktop.NetworkManager.Settings.Connection.xml
index 55bdaff669..db547746ae 100644
--- a/introspection/org.freedesktop.NetworkManager.Settings.Connection.xml
+++ b/introspection/org.freedesktop.NetworkManager.Settings.Connection.xml
@@ -118,6 +118,7 @@
           arguments are accepted. Specifying unknown keys causes the call
           to fail.
         @result: output argument, currently no results are returned.
+        @since: 1.12
 
         Update the connection with new settings and properties (replacing all
         previous settings and properties). If the flag 0x1 is present,
@@ -136,8 +137,6 @@
         associated with each secret.
 
         Update2 is a extensible alternative to Update, UpdateUnsaved and Save.
-
-        Since: 1.12
     -->
     <method name="Update2">
       <arg name="settings" type="a{sa{sv}}" direction="in"/>
@@ -168,21 +167,19 @@
 
     <!--
         Flags:
+        @since: 1.12
 
         Additional flags of the connection profile.
 
         Returns: <link linkend="NMSettingsConnectionFlags">NMSettingsConnectionFlags</link>
-
-        Since: 1.12
     -->
     <property name="Flags" type="u" access="read"/>
 
     <!--
         Filename:
+        @since: 1.12
 
         File that stores the connection in case the connection is file-backed.
-
-        Since: 1.12
     -->
     <property name="Filename" type="s" access="read"/>
 
diff --git a/introspection/org.freedesktop.NetworkManager.Settings.xml b/introspection/org.freedesktop.NetworkManager.Settings.xml
index 28c89ff4f7..e0d5b7d176 100644
--- a/introspection/org.freedesktop.NetworkManager.Settings.xml
+++ b/introspection/org.freedesktop.NetworkManager.Settings.xml
@@ -76,6 +76,7 @@
           to fail.
         @path: Object path of the new connection that was just added.
         @result: output argument, currently no additional results are returned.
+        @since: 1.20
 
         Add a new connection profile.
 
@@ -87,8 +88,6 @@
 
         AddConnection2 is a extensible alternative to AddConnection, and AddConnectionUnsaved.
         The new variant can do everything that the older variants could, and more.
-
-        Since: 1.20
     -->
     <method name="AddConnection2">
       <arg name="settings" type="a{sa{sv}}" direction="in"/>
diff --git a/introspection/org.freedesktop.NetworkManager.WifiP2PPeer.xml b/introspection/org.freedesktop.NetworkManager.WifiP2PPeer.xml
index 760849c3f0..2c7b82df9e 100644
--- a/introspection/org.freedesktop.NetworkManager.WifiP2PPeer.xml
+++ b/introspection/org.freedesktop.NetworkManager.WifiP2PPeer.xml
@@ -3,8 +3,7 @@
   <!--
       org.freedesktop.NetworkManager.WifiP2PPeer:
       @short_description: Wi-Fi P2P Peer
-
-      Since: 1.16
+      @since: 1.16
   -->
   <interface name="org.freedesktop.NetworkManager.WifiP2PPeer">
     <annotation name="org.gtk.GDBus.C.Name" value="Wifi_P2P_Peer"/>
@@ -18,8 +17,6 @@
         Name:
 
         Device name.
-
-        Since: 1.16
     -->
     <property name="Name" type="s" access="read"/>
 
@@ -29,8 +26,6 @@
         Flags describing the capabilities of the access point.
 
         Returns: <link linkend="NM80211ApFlags">NM80211ApFlags</link>
-
-        Since: 1.16
     -->
     <property name="Flags" type="u" access="read"/>
 
@@ -38,8 +33,6 @@
         Manufacturer:
 
         The manufacturer of the Wi-Fi P2P peer.
-
-        Since: 1.16
     -->
     <property name="Manufacturer" type="s" access="read"/>
 
@@ -47,8 +40,6 @@
         Model:
 
         The model of the Wi-Fi P2P peer.
-
-        Since: 1.16
     -->
     <property name="Model" type="s" access="read"/>
 
@@ -56,8 +47,6 @@
         ModelNumber:
 
         The model number of the Wi-Fi P2P peer.
-
-        Since: 1.16
     -->
     <property name="ModelNumber" type="s" access="read"/>
 
@@ -65,8 +54,6 @@
         Serial:
 
         The serial number of the Wi-Fi P2P peer.
-
-        Since: 1.16
     -->
     <property name="Serial" type="s" access="read"/>
 
@@ -74,8 +61,6 @@
         WfdIEs:
 
         The Wi-Fi Display Information Elements of the Wi-Fi P2P peer.
-
-        Since: 1.16
     -->
     <property name="WfdIEs" type="ay" access="read"/>
 
@@ -83,8 +68,6 @@
         HwAddress:
 
         The hardware address (BSSID) of the access point.
-
-        Since: 1.16
     -->
     <property name="HwAddress" type="s" access="read"/>
 
@@ -92,8 +75,6 @@
         Strength:
 
         The current signal quality of the access point, in percent.
-
-        Since: 1.16
     -->
     <property name="Strength" type="y" access="read"/>
 
@@ -103,8 +84,6 @@
         The timestamp (in CLOCK_BOOTTIME seconds) for the last time the access
         point was found in scan results. A value of -1 means the access point has
         never been found in scan results.
-
-        Since: 1.16
     -->
     <property name="LastSeen" type="i" access="read"/>
 
diff --git a/introspection/org.freedesktop.NetworkManager.xml b/introspection/org.freedesktop.NetworkManager.xml
index ff74c5122d..475f329f2c 100644
--- a/introspection/org.freedesktop.NetworkManager.xml
+++ b/introspection/org.freedesktop.NetworkManager.xml
@@ -296,10 +296,9 @@
           will be recalculated to give the approximate new expiration time.
           The new "RollbackTimeout" property will be approximate up to
           one second precision, which is the accuracy of the property.
+        @since: 1.12
 
         Reset the timeout for rollback for the checkpoint.
-
-        Since: 1.12
     -->
     <method name="CheckpointAdjustRollbackTimeout">
       <arg name="checkpoint" type="o" direction="in"/>