Merge remote-tracking branch 'salsa/upstream' into upstream

1 files changed, 21 insertions, 2 deletions

diff --git a/introspection/org.freedesktop.NetworkManager.IP4Config.xml b/introspection/org.freedesktop.NetworkManager.IP4Config.xml
index 0b04af94..e4388fd4 100644
--- a/introspection/org.freedesktop.NetworkManager.IP4Config.xml
+++ b/introspection/org.freedesktop.NetworkManager.IP4Config.xml
@@ -55,11 +55,21 @@
     <!--
         Nameservers:
 
-        The nameservers in use.
+        The nameservers in use. Deprecated: use NameserverData
     -->
     <property name="Nameservers" type="au" access="read"/>
 
     <!--
+        NameserverData:
+
+        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"/>
+
+    <!--
         Domains:
 
         A list of domains this address belongs to.
@@ -92,11 +102,20 @@
         WinsServers:
 
         The Windows Internet Name Service servers associated with the connection.
-        Each address is in network byte order.
+        Each address is in network byte order. Deprecated: use WinsServerData
     -->
     <property name="WinsServers" type="au" access="read"/>
 
     <!--
+        WinsServerData:
+
+        The Windows Internet Name Service servers associated with the connection.
+
+        Since: 1.14
+    -->
+    <property name="WinsServerData" type="as" access="read"/>
+
+    <!--
         PropertiesChanged:
         @properties: A dictionary mapping property names to variant boxed values