From e152ec7bf4ba252ff9d3eb13eabd417b931dac9a Mon Sep 17 00:00:00 2001
From: Iain Lane <iain@orangesquash.org.uk>
Date: Mon, 24 Sep 2018 09:29:55 +0100
Subject: Import Upstream version 1.12.2

---
 introspection/meson.build                          | 90 ++++++++++++++++++++++
 .../org.freedesktop.NetworkManager.Device.Bond.xml |  2 +-
 ...rg.freedesktop.NetworkManager.Device.Bridge.xml |  2 +-
 ....freedesktop.NetworkManager.Device.IPTunnel.xml |  7 ++
 ...freedesktop.NetworkManager.Device.OvsBridge.xml | 10 +++
 ...g.freedesktop.NetworkManager.Device.OvsPort.xml | 10 +++
 .../org.freedesktop.NetworkManager.Device.Team.xml |  2 +-
 ....freedesktop.NetworkManager.Device.Wireless.xml | 10 +++
 .../org.freedesktop.NetworkManager.PPP.xml         |  5 ++
 ...edesktop.NetworkManager.Settings.Connection.xml | 22 +++++-
 introspection/org.freedesktop.NetworkManager.xml   | 30 +++++++-
 11 files changed, 185 insertions(+), 5 deletions(-)
 create mode 100644 introspection/meson.build

(limited to 'introspection')

diff --git a/introspection/meson.build b/introspection/meson.build
new file mode 100644
index 00000000..b135a867
--- /dev/null
+++ b/introspection/meson.build
@@ -0,0 +1,90 @@
+ifaces_secret_agent_xml = files('org.freedesktop.NetworkManager.SecretAgent.xml')
+
+ifaces_vpn_plugin_xml = files('org.freedesktop.NetworkManager.VPN.Plugin.xml')
+
+ifaces = [
+  'org.freedesktop.NetworkManager.AccessPoint',
+  'org.freedesktop.NetworkManager.AgentManager',
+  'org.freedesktop.NetworkManager.Checkpoint',
+  'org.freedesktop.NetworkManager.Connection.Active',
+  'org.freedesktop.NetworkManager.Device.Adsl',
+  'org.freedesktop.NetworkManager.Device.Bluetooth',
+  'org.freedesktop.NetworkManager.Device.Bond',
+  'org.freedesktop.NetworkManager.Device.Bridge',
+  'org.freedesktop.NetworkManager.Device.Dummy',
+  'org.freedesktop.NetworkManager.Device.Generic',
+  'org.freedesktop.NetworkManager.Device.Infiniband',
+  'org.freedesktop.NetworkManager.Device.IPTunnel',
+  'org.freedesktop.NetworkManager.Device.Macsec',
+  'org.freedesktop.NetworkManager.Device.Macvlan',
+  'org.freedesktop.NetworkManager.Device.Modem',
+  'org.freedesktop.NetworkManager.Device.OlpcMesh',
+  'org.freedesktop.NetworkManager.Device.OvsInterface',
+  'org.freedesktop.NetworkManager.Device.OvsPort',
+  'org.freedesktop.NetworkManager.Device.OvsBridge',
+  'org.freedesktop.NetworkManager.Device.Ppp',
+  'org.freedesktop.NetworkManager.Device.Statistics',
+  'org.freedesktop.NetworkManager.Device.Team',
+  'org.freedesktop.NetworkManager.Device.Tun',
+  'org.freedesktop.NetworkManager.Device.Veth',
+  'org.freedesktop.NetworkManager.Device.Vlan',
+  'org.freedesktop.NetworkManager.Device.Vxlan',
+  'org.freedesktop.NetworkManager.Device.WiMax',
+  'org.freedesktop.NetworkManager.Device.Wired',
+  'org.freedesktop.NetworkManager.Device.Wireless',
+  'org.freedesktop.NetworkManager.Device',
+  'org.freedesktop.NetworkManager.DHCP4Config',
+  'org.freedesktop.NetworkManager.DHCP6Config',
+  'org.freedesktop.NetworkManager.DnsManager',
+  'org.freedesktop.NetworkManager.IP4Config',
+  'org.freedesktop.NetworkManager.IP6Config',
+  'org.freedesktop.NetworkManager',
+  'org.freedesktop.NetworkManager.PPP',
+  'org.freedesktop.NetworkManager.SecretAgent',
+  'org.freedesktop.NetworkManager.Settings.Connection',
+  'org.freedesktop.NetworkManager.Settings',
+  'org.freedesktop.NetworkManager.VPN.Connection',
+  'org.freedesktop.NetworkManager.VPN.Plugin',
+  'org.freedesktop.NetworkManager.WiMax.Nsp'
+]
+
+ifaces_xmls = []
+sources = []
+
+# FIXME?: DBUS_INTERFACE_DOCS/docbook files are generated in
+# "meson.current_build_dir()" instead of "meson.source_root()/docs/api"
+foreach iface: ifaces
+  iface_xml = iface + '.xml'
+  ifaces_xmls += files(iface_xml)
+
+  sources += gnome.gdbus_codegen(
+    iface,
+    iface_xml,
+    interface_prefix: 'org.freedesktop.NetworkManager',
+    namespace: 'NMDBus',
+    docbook: 'dbus'
+  )
+
+  # FIXME: gnome.gdbus_codegen should return the docbook as a target result
+  content_files += join_paths(meson.current_build_dir(), 'dbus-' + iface_xml)
+endforeach
+
+install_data(
+  ifaces_xmls,
+  install_dir: dbus_ifaces_dir
+)
+
+libnmdbus = static_library(
+  'nmdbus',
+  sources: sources,
+  include_directories: top_inc,
+  dependencies: glib_dep
+)
+
+libnmdbus_dep = declare_dependency(
+  # FIXME: only headers should be added here to resolve dependencies on
+  #        libNetworkManagerBase and libNetworkManager
+  #sources: sources,
+  include_directories: include_directories('.'),
+  link_with: libnmdbus
+)
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Bond.xml b/introspection/org.freedesktop.NetworkManager.Device.Bond.xml
index 9ee24e81..e3b5574e 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Bond.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Bond.xml
@@ -25,7 +25,7 @@
     <!--
         Slaves:
 
-        Array of object paths representing devices which are currently slaved to
+        Array of object paths representing devices which are currently enslaved to
         this device.
     -->
     <property name="Slaves" type="ao" access="read"/>
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Bridge.xml b/introspection/org.freedesktop.NetworkManager.Device.Bridge.xml
index e64e4006..7f260569 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Bridge.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Bridge.xml
@@ -25,7 +25,7 @@
     <!--
         Slaves:
 
-        Array of object paths representing devices which are currently slaved to
+        Array of object paths representing devices which are currently enslaved to
         this device.
     -->
     <property name="Slaves" type="ao" access="read"/>
diff --git a/introspection/org.freedesktop.NetworkManager.Device.IPTunnel.xml b/introspection/org.freedesktop.NetworkManager.Device.IPTunnel.xml
index ef92f3a9..7c464b94 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.IPTunnel.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.IPTunnel.xml
@@ -88,6 +88,13 @@
     -->
     <property name="FlowLabel" type="u" access="read"/>
 
+    <!--
+        Flags:
+
+        Tunnel flags.
+    -->
+    <property name="Flags" type="u" access="read"/>
+
     <!--
         PropertiesChanged:
         @properties: A dictionary mapping property names to variant boxed values
diff --git a/introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml b/introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml
index 08ed5dc0..eae9c8d0 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml
@@ -7,6 +7,16 @@
   -->
   <interface name="org.freedesktop.NetworkManager.Device.OvsBridge">
 
+    <!--
+        Slaves:
+
+        Array of object paths representing ports which are currently enslaved to
+        this bridge.
+
+        Since: 1.12.2
+    -->
+    <property name="Slaves" type="ao" access="read"/>
+
     <!--
         PropertiesChanged:
         @properties: A dictionary mapping property names to variant boxed values
diff --git a/introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml b/introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml
index d4900f51..1e1b411c 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml
@@ -7,6 +7,16 @@
   -->
   <interface name="org.freedesktop.NetworkManager.Device.OvsPort">
 
+    <!--
+        Slaves:
+
+        Array of object paths representing interfaces which are currently enslaved to
+        this port.
+
+        Since: 1.12.2
+    -->
+    <property name="Slaves" type="ao" access="read"/>
+
     <!--
         PropertiesChanged:
         @properties: A dictionary mapping property names to variant boxed values
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Team.xml b/introspection/org.freedesktop.NetworkManager.Device.Team.xml
index c187b511..2318dd6f 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Team.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Team.xml
@@ -25,7 +25,7 @@
     <!--
         Slaves:
 
-        Array of object paths representing devices which are currently slaved to
+        Array of object paths representing devices which are currently enslaved to
         this device.
     -->
     <property name="Slaves" type="ao" access="read"/>
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml b/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml
index bff89120..13038545 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml
@@ -96,6 +96,16 @@
     -->
     <property name="WirelessCapabilities" type="u" access="read"/>
 
+    <!--
+        LastScan:
+
+        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"/>
+
     <!--
         PropertiesChanged:
         @properties: A dictionary containing the changed parameters.
diff --git a/introspection/org.freedesktop.NetworkManager.PPP.xml b/introspection/org.freedesktop.NetworkManager.PPP.xml
index 401ee949..d840c786 100644
--- a/introspection/org.freedesktop.NetworkManager.PPP.xml
+++ b/introspection/org.freedesktop.NetworkManager.PPP.xml
@@ -25,5 +25,10 @@
     <method name="SetState">
       <arg name="state" type="u" direction="in"/>
     </method>
+
+    <method name="SetIfindex">
+      <arg name="ifindex" type="i" direction="in"/>
+    </method>
+
   </interface>
 </node>
diff --git a/introspection/org.freedesktop.NetworkManager.Settings.Connection.xml b/introspection/org.freedesktop.NetworkManager.Settings.Connection.xml
index 29ddfd00..2cbb6c2e 100644
--- a/introspection/org.freedesktop.NetworkManager.Settings.Connection.xml
+++ b/introspection/org.freedesktop.NetworkManager.Settings.Connection.xml
@@ -130,7 +130,7 @@
 
         Update2 is a extensible alternative to Update, UpdateUnsaved and Save.
 
-        Since: 1.10.2
+        Since: 1.12
     -->
     <method name="Update2">
       <arg name="settings" type="a{sa{sv}}" direction="in"/>
@@ -159,6 +159,26 @@
     -->
     <property name="Unsaved" type="b" access="read"/>
 
+    <!--
+        Flags:
+
+        Additional flags of the connection profile.
+
+        Returns: <link linkend="NMSettingsConnectionFlags">NMSettingsConnectionFlags</link>
+
+        Since: 1.12
+    -->
+    <property name="Flags" type="u" access="read"/>
+
+    <!--
+        Filename:
+
+        File that stores the connection in case the connection is file-backed.
+
+        Since: 1.12
+    -->
+    <property name="Filename" type="s" access="read"/>
+
     <!--
         PropertiesChanged:
         @properties: A dictionary mapping property names to variant boxed values.
diff --git a/introspection/org.freedesktop.NetworkManager.xml b/introspection/org.freedesktop.NetworkManager.xml
index dceea7f2..6c6ec282 100644
--- a/introspection/org.freedesktop.NetworkManager.xml
+++ b/introspection/org.freedesktop.NetworkManager.xml
@@ -205,7 +205,7 @@
         @state: <link linkend="NMState">NMState</link>
 
         The overall networking state as determined by the NetworkManager daemon,
-        based on the state of network devices under it's management.
+        based on the state of network devices under its management.
     -->
     <method name="state">
       <arg name="state" type="u" direction="out"/>
@@ -251,6 +251,27 @@
       <arg name="result" type="a{su}" direction="out" />
     </method>
 
+    <!--
+        CheckpointAdjustRollbackTimeout:
+        @add_timeout: number of seconds from ~now~ in which the
+          timeout will expire. Set to 0 to disable the timeout.
+          Note that the added seconds start counting from now,
+          not "Created" timestamp or the previous expiration
+          time. Note that the "Created" property of the checkpoint
+          will stay unchanged by this call. However, the "RollbackTimeout"
+          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.
+
+        Reset the timeout for rollback for the checkpoint.
+
+        Since: 1.12
+    -->
+    <method name="CheckpointAdjustRollbackTimeout">
+      <arg name="checkpoint" type="o" direction="in"/>
+      <arg name="add_timeout" type="u" direction="in"/>
+    </method>
+
     <!--
         Devices:
 
@@ -269,6 +290,13 @@
     -->
     <property name="AllDevices" type="ao" access="read"/>
 
+    <!--
+        Checkpoints:
+
+        The list of active checkpoints.
+    -->
+    <property name="Checkpoints" type="ao" access="read"/>
+
     <!--
         NetworkingEnabled:
 
-- 
cgit 1.3.0-6-gf8a5