New upstream version 1.12.4 upstream/1.12.4

7 files changed, 4 insertions, 105 deletions

diff --git a/introspection/meson.build b/introspection/meson.build
index a5540836..b135a867 100644
--- a/introspection/meson.build
+++ b/introspection/meson.build
@@ -15,7 +15,6 @@ 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',
@@ -31,8 +30,6 @@ 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',
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Lowpan.xml b/introspection/org.freedesktop.NetworkManager.Device.Lowpan.xml
deleted file mode 100644
index c0317be6..00000000
--- a/introspection/org.freedesktop.NetworkManager.Device.Lowpan.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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 402ee028..eae9c8d0 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.14
+        Since: 1.12.2
     -->
     <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 c2db70ff..1e1b411c 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.14
+        Since: 1.12.2
     -->
     <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
deleted file mode 100644
index 8a18d9bd..00000000
--- a/introspection/org.freedesktop.NetworkManager.Device.WireGuard.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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
deleted file mode 100644
index 32bc6f95..00000000
--- a/introspection/org.freedesktop.NetworkManager.Device.Wpan.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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 e4388fd4..0b04af94 100644
--- a/introspection/org.freedesktop.NetworkManager.IP4Config.xml
+++ b/introspection/org.freedesktop.NetworkManager.IP4Config.xml
@@ -55,21 +55,11 @@
     <!--
         Nameservers:
 
-        The nameservers in use. Deprecated: use NameserverData
+        The nameservers in use.
     -->
     <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.
@@ -102,20 +92,11 @@
         WinsServers:
 
         The Windows Internet Name Service servers associated with the connection.
-        Each address is in network byte order. Deprecated: use WinsServerData
+        Each address is in network byte order.
     -->
     <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