New upstream version 1.14.2 upstream/1.14.2

7 files changed, 115 insertions, 6 deletions

diff --git a/introspection/meson.build b/introspection/meson.build
index b135a867..35d8c87c 100644
--- a/introspection/meson.build
+++ b/introspection/meson.build
@@ -15,6 +15,7 @@ ifaces = [
   'org.freedesktop.NetworkManager.Device.Generic',
   'org.freedesktop.NetworkManager.Device.Infiniband',
   'org.freedesktop.NetworkManager.Device.IPTunnel',
+  'org.freedesktop.NetworkManager.Device.Lowpan',
   'org.freedesktop.NetworkManager.Device.Macsec',
   'org.freedesktop.NetworkManager.Device.Macvlan',
   'org.freedesktop.NetworkManager.Device.Modem',
@@ -30,6 +31,8 @@ ifaces = [
   'org.freedesktop.NetworkManager.Device.Vlan',
   'org.freedesktop.NetworkManager.Device.Vxlan',
   'org.freedesktop.NetworkManager.Device.WiMax',
+  'org.freedesktop.NetworkManager.Device.Wpan',
+  'org.freedesktop.NetworkManager.Device.WireGuard',
   'org.freedesktop.NetworkManager.Device.Wired',
   'org.freedesktop.NetworkManager.Device.Wireless',
   'org.freedesktop.NetworkManager.Device',
@@ -50,6 +53,7 @@ ifaces = [
 
 ifaces_xmls = []
 sources = []
+introspection_files = []
 
 # FIXME?: DBUS_INTERFACE_DOCS/docbook files are generated in
 # "meson.current_build_dir()" instead of "meson.source_root()/docs/api"
@@ -57,7 +61,7 @@ foreach iface: ifaces
   iface_xml = iface + '.xml'
   ifaces_xmls += files(iface_xml)
 
-  sources += gnome.gdbus_codegen(
+  res = gnome.gdbus_codegen(
     iface,
     iface_xml,
     interface_prefix: 'org.freedesktop.NetworkManager',
@@ -65,8 +69,15 @@ foreach iface: ifaces
     docbook: 'dbus'
   )
 
-  # FIXME: gnome.gdbus_codegen should return the docbook as a target result
+  sources += res
+
   content_files += join_paths(meson.current_build_dir(), 'dbus-' + iface_xml)
+
+  # res is an array only since 0.46. Documentation won't work with
+  # older versions
+  if meson.version().version_compare('>= 0.46.0')
+    introspection_files += res[2]
+  endif
 endforeach
 
 install_data(
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Lowpan.xml b/introspection/org.freedesktop.NetworkManager.Device.Lowpan.xml
new file mode 100644
index 00000000..c0317be6
--- /dev/null
+++ b/introspection/org.freedesktop.NetworkManager.Device.Lowpan.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
+  <!--
+      org.freedesktop.NetworkManager.Device.Lowpan:
+      @short_description: 6LoWPAN Device
+
+  -->
+  <interface name="org.freedesktop.NetworkManager.Device.Lowpan">
+
+    <!--
+        HwAddress:
+
+        The active hardware address of the device.
+    -->
+    <property name="HwAddress" type="s" access="read"/>
+
+    <!--
+        Parent:
+
+        The object path of the parent device.
+    -->
+    <property name="Parent" type="o" access="read"/>
+  </interface>
+</node>
diff --git a/introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml b/introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml
index eae9c8d0..402ee028 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml
@@ -13,7 +13,7 @@
         Array of object paths representing ports which are currently enslaved to
         this bridge.
 
-        Since: 1.12.2
+        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 1e1b411c..c2db70ff 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml
@@ -13,7 +13,7 @@
         Array of object paths representing interfaces which are currently enslaved to
         this port.
 
-        Since: 1.12.2
+        Since: 1.14
     -->
     <property name="Slaves" type="ao" access="read"/>
 
diff --git a/introspection/org.freedesktop.NetworkManager.Device.WireGuard.xml b/introspection/org.freedesktop.NetworkManager.Device.WireGuard.xml
new file mode 100644
index 00000000..8a18d9bd
--- /dev/null
+++ b/introspection/org.freedesktop.NetworkManager.Device.WireGuard.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
+  <!--
+      org.freedesktop.NetworkManager.Device.WireGuard:
+      @short_description: WireGuard Device
+
+  -->
+  <interface name="org.freedesktop.NetworkManager.Device.WireGuard">
+
+    <!--
+        PublicKey:
+
+        32-byte public WireGuard key.
+    -->
+    <property name="PublicKey" type="ay" access="read">
+      <!-- gdbus-codegen assumes that "ay" means "non-UTF-8 string" and
+           won't deal with '\0' bytes correctly.
+      -->
+      <annotation name="org.gtk.GDBus.C.ForceGVariant" value="1"/>
+    </property>
+
+    <!--
+        ListenPort:
+
+        Local UDP listening port.
+    -->
+    <property name="ListenPort" type="q" access="read"/>
+
+    <!--
+        FwMark:
+
+        Optional 32-bit mark used to set routing policy for outgoing encrypted packets.
+        See: ip-rule(8)
+    -->
+    <property name="FwMark" type="u" access="read"/>
+  </interface>
+</node>
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Wpan.xml b/introspection/org.freedesktop.NetworkManager.Device.Wpan.xml
new file mode 100644
index 00000000..32bc6f95
--- /dev/null
+++ b/introspection/org.freedesktop.NetworkManager.Device.Wpan.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
+  <!--
+      org.freedesktop.NetworkManager.Device.Wpan:
+      @short_description: IEEE 802.15.4 (WPAN) MAC Layer Device
+
+  -->
+  <interface name="org.freedesktop.NetworkManager.Device.Wpan">
+
+    <!--
+        HwAddress:
+
+        The active hardware address of the device.
+    -->
+    <property name="HwAddress" type="s" access="read"/>
+
+  </interface>
+</node>
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