New upstream version 1.22.0 upstream/1.22.0

13 files changed, 42 insertions, 6 deletions

diff --git a/introspection/meson.build b/introspection/meson.build
index ad9a6db0..3f8a1b15 100644
--- a/introspection/meson.build
+++ b/introspection/meson.build
@@ -77,7 +77,7 @@ foreach iface: ifaces
   if gio_unix_dep.version().version_compare('>= 2.51.3')
     dbus_iface_xml_path = join_paths(meson.current_build_dir(), 'dbus-' + iface_xml)
   else
-    dbus_iface_xml_path = join_paths(meson.build_root(), 'dbus-' + iface_xml)
+    dbus_iface_xml_path = join_paths(build_root, 'dbus-' + iface_xml)
   endif
 
   content_files += dbus_iface_xml_path
@@ -93,7 +93,7 @@ endforeach
 
 install_data(
   ifaces_xmls,
-  install_dir: dbus_ifaces_dir,
+  install_dir: dbus_interfaces_dir,
 )
 
 libnmdbus = static_library(
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Adsl.xml b/introspection/org.freedesktop.NetworkManager.Device.Adsl.xml
index ef1f580f..5bb18aae 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Adsl.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Adsl.xml
@@ -21,6 +21,9 @@
         Carrier:
 
         Indicates whether the physical carrier is found.
+
+        DEPRECATED: check for the "carrier" flag in the "InterfaceFlags"
+        property on the "org.freedesktop.NetworkManager.Device" interface.
     -->
     <property name="Carrier" type="b" access="read"/>
   </interface>
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Bond.xml b/introspection/org.freedesktop.NetworkManager.Device.Bond.xml
index e3b5574e..30421a54 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Bond.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Bond.xml
@@ -19,6 +19,9 @@
 
         Indicates whether the physical carrier is found (e.g. whether a cable is
         plugged in or not).
+
+        DEPRECATED: check for the "lower-up" flag in the "InterfaceFlags"
+        property on the "org.freedesktop.NetworkManager.Device" interface.
     -->
     <property name="Carrier" type="b" access="read"/>
 
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Bridge.xml b/introspection/org.freedesktop.NetworkManager.Device.Bridge.xml
index 7f260569..011805ac 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Bridge.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Bridge.xml
@@ -19,6 +19,9 @@
 
         Indicates whether the physical carrier is found (e.g. whether a cable is
         plugged in or not).
+
+        DEPRECATED: check for the "carrier" flag in the "InterfaceFlags"
+        property on the "org.freedesktop.NetworkManager.Device" interface.
     -->
     <property name="Carrier" type="b" access="read"/>
 
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Infiniband.xml b/introspection/org.freedesktop.NetworkManager.Device.Infiniband.xml
index 26e2694b..cc03b74b 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Infiniband.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Infiniband.xml
@@ -19,6 +19,9 @@
 
         Indicates whether the physical carrier is found (e.g. whether a cable is
         plugged in or not).
+
+        DEPRECATED: check for the "lower-up" flag in the "InterfaceFlags"
+        property on the "org.freedesktop.NetworkManager.Device" interface.
     -->
     <property name="Carrier" type="b" access="read"/>
 
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Team.xml b/introspection/org.freedesktop.NetworkManager.Device.Team.xml
index 2318dd6f..a0caa399 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Team.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Team.xml
@@ -19,6 +19,9 @@
 
         Indicates whether the physical carrier is found (e.g. whether a cable is
         plugged in or not).
+
+        DEPRECATED: check for the "lower-up" flag in the "InterfaceFlags"
+        property on the "org.freedesktop.NetworkManager.Device" interface.
     -->
     <property name="Carrier" type="b" access="read"/>
 
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Vlan.xml b/introspection/org.freedesktop.NetworkManager.Device.Vlan.xml
index 75d6ba43..1bc83fce 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Vlan.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Vlan.xml
@@ -19,6 +19,9 @@
 
         Indicates whether the physical carrier is found (e.g. whether a cable is
         plugged in or not).
+
+        DEPRECATED: check for the "carrier" flag in the "InterfaceFlags"
+        property on the "org.freedesktop.NetworkManager.Device" interface.
     -->
     <property name="Carrier" type="b" access="read"/>
 
diff --git a/introspection/org.freedesktop.NetworkManager.Device.WiMax.xml b/introspection/org.freedesktop.NetworkManager.Device.WiMax.xml
index ac2a393a..532b6964 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.WiMax.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.WiMax.xml
@@ -4,6 +4,7 @@
       org.freedesktop.NetworkManager.Device.WiMax:
       @short_description: WiMax Device
 
+      DEPRECATED: NetworkManager no longer supports WiMAX since version 1.2. This interface is no longer used.
   -->
   <interface name="org.freedesktop.NetworkManager.Device.WiMax">
 
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Wired.xml b/introspection/org.freedesktop.NetworkManager.Device.Wired.xml
index ae709031..f62c3f0c 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Wired.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Wired.xml
@@ -41,6 +41,9 @@
 
         Indicates whether the physical carrier is found (e.g. whether a cable is
         plugged in or not).
+
+        DEPRECATED: check for the "carrier" flag in the "InterfaceFlags"
+        property on the "org.freedesktop.NetworkManager.Device" interface.
     -->
     <property name="Carrier" type="b" access="read"/>
 
diff --git a/introspection/org.freedesktop.NetworkManager.Device.xml b/introspection/org.freedesktop.NetworkManager.Device.xml
index 65c2a2c0..ca9dd8d7 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.xml
@@ -279,6 +279,17 @@
     <property name="Ip6Connectivity" type="u" access="read"/>
 
     <!--
+        InterfaceFlags:
+
+        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"/>
+
+    <!--
         Reapply:
         @connection: The optional connection settings that will be reapplied on the device. If empty, the currently active settings-connection will be used. The connection cannot arbitrarly differ from the current applied-connection otherwise the call will fail. Only certain changes are supported, like adding or removing IP addresses.
         @version_id: If non-zero, the current version id of the applied-connection must match. The current version id can be retrieved via GetAppliedConnection. This optional argument allows to catch concurrent modifications between the GetAppliedConnection call and Reapply.
diff --git a/introspection/org.freedesktop.NetworkManager.Settings.xml b/introspection/org.freedesktop.NetworkManager.Settings.xml
index f7be2717..0587db5f 100644
--- a/introspection/org.freedesktop.NetworkManager.Settings.xml
+++ b/introspection/org.freedesktop.NetworkManager.Settings.xml
@@ -102,6 +102,7 @@
         LoadConnections:
         @filenames: Array of paths to on-disk connection profiles in directories monitored by NetworkManager.
         @status: Success or failure of the operation as a whole. True if NetworkManager at least tried to load the indicated connections, even if it did not succeed. False if an error occurred before trying to load the connections (eg, permission denied).
+          Note that before 1.20, NetworkManager had a bug and this @status value was wrong. It is better to assume success if the method does not return with a D-Bus error. On top of that, you can look at @failures to know whether any of the requested files failed.
         @failures: Paths of connection files that could not be loaded.
 
         Loads or reloads the indicated connections from disk. You should call this
@@ -119,7 +120,7 @@
 
     <!--
         ReloadConnections:
-        @status: Success or failure.
+        @status: This always returns %TRUE.
 
         Tells NetworkManager to reload all connection files from disk, including
         noticing any added or deleted connection files. By default, connections
diff --git a/introspection/org.freedesktop.NetworkManager.WiMax.Nsp.xml b/introspection/org.freedesktop.NetworkManager.WiMax.Nsp.xml
index 1028afc0..cc074808 100644
--- a/introspection/org.freedesktop.NetworkManager.WiMax.Nsp.xml
+++ b/introspection/org.freedesktop.NetworkManager.WiMax.Nsp.xml
@@ -4,6 +4,7 @@
       org.freedesktop.NetworkManager.WiMax.Nsp:
       @short_description: WiMax Network Service Provider
 
+      DEPRECATED: NetworkManager no longer supports WiMAX since version 1.2. This interface is no longer used.
   -->
   <interface name="org.freedesktop.NetworkManager.WiMax.Nsp">
 
diff --git a/introspection/org.freedesktop.NetworkManager.xml b/introspection/org.freedesktop.NetworkManager.xml
index bb48941b..0ebfe243 100644
--- a/introspection/org.freedesktop.NetworkManager.xml
+++ b/introspection/org.freedesktop.NetworkManager.xml
@@ -372,15 +372,16 @@
     <!--
         WimaxEnabled:
 
-        Indicates if WiMAX devices are currently enabled or not.
+        DEPRECATED. Doesn't have any meaning and is around only for
+        compatibility reasons.
     -->
     <property name="WimaxEnabled" type="b" access="readwrite"/>
 
     <!--
         WimaxHardwareEnabled:
 
-        Indicates if the WiMAX hardware is currently enabled, i.e. the state of
-        the RF kill switch.
+        DEPRECATED. Doesn't have any meaning and is around only for
+        compatibility reasons.
     -->
     <property name="WimaxHardwareEnabled" type="b" access="read"/>