Hello community,
here is the log from the commit of package libKF5NetworkManagerQt for
openSUSE:Factory checked in at 2015-09-24 07:14:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libKF5NetworkManagerQt (Old)
and /work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libKF5NetworkManagerQt"
Changes:
--------
---
/work/SRC/openSUSE:Factory/libKF5NetworkManagerQt/libKF5NetworkManagerQt.changes
2015-09-02 07:49:11.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new/libKF5NetworkManagerQt.changes
2015-09-24 07:14:44.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Sep 8 17:13:41 UTC 2015 - hrvoje.sen...@gmail.com
+
+- Update to 5.14.0
+ * Added new properties from the latest NM snapshot/releases
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.14.0.php
+
+-------------------------------------------------------------------
Old:
----
networkmanager-qt-5.13.0.tar.xz
New:
----
networkmanager-qt-5.14.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libKF5NetworkManagerQt.spec ++++++
--- /var/tmp/diff_new_pack.fnJaYO/_old 2015-09-24 07:14:45.000000000 +0200
+++ /var/tmp/diff_new_pack.fnJaYO/_new 2015-09-24 07:14:45.000000000 +0200
@@ -17,9 +17,9 @@
%define soversion 6
-%define _tar_path 5.13
+%define _tar_path 5.14
Name: libKF5NetworkManagerQt
-Version: 5.13.0
+Version: 5.14.0
Release: 0
Summary: A Qt wrapper for NetworkManager DBus API
License: LGPL-2.1 or LGPL-3.0
++++++ networkmanager-qt-5.13.0.tar.xz -> networkmanager-qt-5.14.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.13.0/CMakeLists.txt
new/networkmanager-qt-5.14.0/CMakeLists.txt
--- old/networkmanager-qt-5.13.0/CMakeLists.txt 2015-08-04 12:12:12.000000000
+0200
+++ new/networkmanager-qt-5.14.0/CMakeLists.txt 2015-09-04 22:22:05.000000000
+0200
@@ -3,7 +3,7 @@
project(NetworkManagerQt)
include(FeatureSummary)
-find_package(ECM 5.13.0 NO_MODULE)
+find_package(ECM 5.14.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake
Modules." URL
"https://projects.kde.org/projects/kdesupport/extra-cmake-modules";)
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND
FATAL_ON_MISSING_REQUIRED_PACKAGES)
@@ -32,7 +32,7 @@
include(ECMSetupVersion)
include(ECMGenerateHeaders)
-set(KF5_VERSION "5.13.0") # handled by release scripts
+set(KF5_VERSION "5.14.0") # handled by release scripts
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX NETWORKMANAGERQT
VERSION_HEADER
"${CMAKE_CURRENT_BINARY_DIR}/networkmanagerqt_version.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.13.0/metainfo.yaml
new/networkmanager-qt-5.14.0/metainfo.yaml
--- old/networkmanager-qt-5.13.0/metainfo.yaml 2015-08-04 12:12:12.000000000
+0200
+++ new/networkmanager-qt-5.14.0/metainfo.yaml 2015-09-04 22:22:05.000000000
+0200
@@ -1,4 +1,7 @@
-maintainer: grulich
+maintainer:
+ - grulich
+ - lvsouza
+ - lukas
description: Qt wrapper for NetworkManager API
tier: 1
type: integration
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.13.0/src/accesspoint.cpp
new/networkmanager-qt-5.14.0/src/accesspoint.cpp
--- old/networkmanager-qt-5.13.0/src/accesspoint.cpp 2015-08-04
12:12:12.000000000 +0200
+++ new/networkmanager-qt-5.14.0/src/accesspoint.cpp 2015-09-04
22:22:05.000000000 +0200
@@ -39,6 +39,9 @@
, maxBitRate(0)
, mode(AccessPoint::Unknown)
, signalStrength(0)
+#if NM_CHECK_VERSION(1, 0, 6)
+ , lastSeen(-1)
+#endif
, q_ptr(q)
{
uni = path;
@@ -53,6 +56,9 @@
hardwareAddress = iface.hwAddress();
maxBitRate = iface.maxBitrate();
mode = q->convertOperationMode(iface.mode());
+#if NM_CHECK_VERSION(1, 0, 6)
+ lastSeen = iface.lastSeen();
+#endif
}
}
@@ -150,6 +156,14 @@
return d->signalStrength;
}
+#if NM_CHECK_VERSION(1, 0, 6)
+int NetworkManager::AccessPoint::lastSeen() const
+{
+ Q_D(const AccessPoint);
+ return d->lastSeen;
+}
+#endif
+
NetworkManager::AccessPoint::OperationMode
NetworkManager::AccessPoint::convertOperationMode(uint mode)
{
NetworkManager::AccessPoint::OperationMode ourMode =
NetworkManager::AccessPoint::Unknown;
@@ -207,6 +221,11 @@
} else if (property == QLatin1String("Strength")) {
signalStrength = it->toInt();
Q_EMIT q->signalStrengthChanged(signalStrength);
+#if NM_CHECK_VERSION(1, 0, 6)
+ } else if (property == QLatin1String("LastSeen")) {
+ lastSeen = it->toInt();
+ Q_EMIT q->lastSeenChanged(lastSeen);
+#endif
} else {
qCWarning(NMQT) << Q_FUNC_INFO << "Unhandled property" << property;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.13.0/src/accesspoint.h
new/networkmanager-qt-5.14.0/src/accesspoint.h
--- old/networkmanager-qt-5.13.0/src/accesspoint.h 2015-08-04
12:12:12.000000000 +0200
+++ new/networkmanager-qt-5.14.0/src/accesspoint.h 2015-09-04
22:22:05.000000000 +0200
@@ -25,6 +25,8 @@
#include <networkmanagerqt/networkmanagerqt_export.h>
+#include <nm-version.h>
+
#include <QObject>
#include <QSharedPointer>
#include <QVariantMap>
@@ -118,6 +120,14 @@
* @return The current signal quality of the access point, in percent.
*/
int signalStrength() const;
+#if NM_CHECK_VERSION(1, 0 , 6)
+ /**
+ * @return The timestamp (in CLOCK_BOOTTIME seconds) for the last time the
access point
+ * was found in scan results. A value of -1 means the access point has
never been found in scan results.
+ * @since 5.14.0
+ */
+ int lastSeen() const;
+#endif
/**
* Helper method to convert wire representation of operation @p mode to
enum
@@ -173,6 +183,18 @@
*/
void frequencyChanged(uint frequency);
+#if NM_CHECK_VERSION(1, 0, 6)
+ /**
+ * This signal is emitted when the timestamp for the last time the access
point was found
+ * in scan results changes
+ *
+ * @param lastSeen the timestamp for the last time the access point was
found in scan results.
+ * @since 5.14.0
+ * @see lastSeen
+ */
+ void lastSeenChanged(int lastSeen);
+#endif
+
private:
Q_DECLARE_PRIVATE(AccessPoint)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.13.0/src/accesspoint_p.h
new/networkmanager-qt-5.14.0/src/accesspoint_p.h
--- old/networkmanager-qt-5.13.0/src/accesspoint_p.h 2015-08-04
12:12:12.000000000 +0200
+++ new/networkmanager-qt-5.14.0/src/accesspoint_p.h 2015-09-04
22:22:05.000000000 +0200
@@ -48,6 +48,10 @@
AccessPoint::OperationMode mode;
int signalStrength;
+#if NM_CHECK_VERSION(1, 0, 6)
+ int lastSeen;
+#endif
+
NetworkManager::AccessPoint::Capabilities convertCapabilities(int caps);
NetworkManager::AccessPoint::WpaFlags convertWpaFlags(uint theirFlags);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.13.0/src/dbus/introspection/nm-active-connection.xml
new/networkmanager-qt-5.14.0/src/dbus/introspection/nm-active-connection.xml
---
old/networkmanager-qt-5.13.0/src/dbus/introspection/nm-active-connection.xml
2015-08-04 12:12:12.000000000 +0200
+++
new/networkmanager-qt-5.14.0/src/dbus/introspection/nm-active-connection.xml
2015-09-04 22:22:05.000000000 +0200
@@ -103,6 +103,13 @@
The path to the master device if the connection is a slave.
</tp:docstring>
</property>
+ <property name="LastSeen" type="i" access="read">
+ <tp:docstring>
+ The timestamp (in CLOCK_BOOTTIME seconds) for the last time the access
+ point was found in scan results. A value of -1 means the access point
+ has never been found in scan results.
+ </tp:docstring>
+ </property>
<signal name="PropertiesChanged">
<annotation name="org.qtproject.QtDBus.QtTypeName.In0"
value="QVariantMap"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.13.0/src/dbus/introspection/nm-device-wifi.xml
new/networkmanager-qt-5.14.0/src/dbus/introspection/nm-device-wifi.xml
--- old/networkmanager-qt-5.13.0/src/dbus/introspection/nm-device-wifi.xml
2015-08-04 12:12:12.000000000 +0200
+++ new/networkmanager-qt-5.14.0/src/dbus/introspection/nm-device-wifi.xml
2015-09-04 22:22:05.000000000 +0200
@@ -36,7 +36,8 @@
<annotation name="org.qtproject.QtDBus.QtTypeName.In0"
value="QVariantMap"/>
<arg name="options" type="a{sv}" direction="in">
<tp:docstring>
- Options of scan
+ Options of scan.
+ Currently 'ssids' option with value of "aay" type is supported.
</tp:docstring>
</arg>
<tp:docstring>
@@ -151,6 +152,23 @@
<tp:flag suffix="ADHOC" value="0x80">
<tp:docstring>The device supports Ad-Hoc mode.</tp:docstring>
</tp:flag>
+ <tp:flag suffix="FREQ_VALID" value="0x100">
+ <tp:docstring>
+ The device properly reports information about supported
+ frequencies and thus both NM_802_11_DEVICE_CAP_FREQ_2GHZ and
+ NM_802_11_DEVICE_CAP_FREQ_5GHZ are valid.
+ </tp:docstring>
+ </tp:flag>
+ <tp:flag suffix="FREQ_2GHZ" value="0x200">
+ <tp:docstring>
+ The device supports 2.4GHz frequencies.
+ </tp:docstring>
+ </tp:flag>
+ <tp:flag suffix="FREQ_5GHZ" value="0x400">
+ <tp:docstring>
+ The device supports 5GHz frequencies.
+ </tp:docstring>
+ </tp:flag>
</tp:flags>
</interface>
</node>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.13.0/src/dbus/introspection/nm-device.xml
new/networkmanager-qt-5.14.0/src/dbus/introspection/nm-device.xml
--- old/networkmanager-qt-5.13.0/src/dbus/introspection/nm-device.xml
2015-08-04 12:12:12.000000000 +0200
+++ new/networkmanager-qt-5.14.0/src/dbus/introspection/nm-device.xml
2015-09-04 22:22:05.000000000 +0200
@@ -107,7 +107,8 @@
If TRUE, indicates the device is allowed to autoconnect. If FALSE,
manual intervention is required before the device will automatically
connect to a known network, such as activating a connection using the
- device, or setting this property to TRUE.
+ device, or setting this property to TRUE. This property cannot be
+ set to TRUE for default-unmanaged devices, since they never
autoconnect.
</tp:docstring>
</property>
<property name="FirmwareMissing" type="b" access="read">
@@ -116,6 +117,12 @@
its operation.
</tp:docstring>
</property>
+ <property name="NmPluginMissing" type="b" access="read">
+ <tp:docstring>
+ If TRUE, indicates the NetworkManager plugin for the device is likely
+ missing or misconfigured.
+ </tp:docstring>
+ </property>
<property name="DeviceType" type="u" access="read"
tp:type="NM_DEVICE_TYPE">
<tp:docstring>
The general type of the network device; ie Ethernet, WiFi, etc.
@@ -139,6 +146,12 @@
The device MTU (maximum transmission unit).
</tp:docstring>
</property>
+ <property name="Metered" type="u" access="read" tp:type="NM_METERED">
+ <tp:docstring>
+ Whether the amount of traffic flowing through the device is
+ subject to limitations, for example set by service providers.
+ </tp:docstring>
+ </property>
<method name="Disconnect">
<annotation name="org.freedesktop.DBus.GLib.CSymbol"
value="impl_device_disconnect"/>
@@ -637,6 +650,49 @@
The SIM PIN was incorrect.
</tp:docstring>
</tp:enumvalue>
+ <tp:enumvalue suffix="NEW_ACTIVATION" value="60">
+ <tp:docstring>
+ A new connection activation was enqueued.
+ </tp:docstring>
+ </tp:enumvalue>
+ <tp:enumvalue suffix="PARENT_CHANGED" value="61">
+ <tp:docstring>
+ The device's parent changed.
+ </tp:docstring>
+ </tp:enumvalue>
+ <tp:enumvalue suffix="PARENT_MANAGED_CHANGED" value="62">
+ <tp:docstring>
+ The device parent's management changed.
+ </tp:docstring>
+ </tp:enumvalue>
+ </tp:enum>
+
+ <tp:enum name="NM_METERED" type="u">
+ <tp:enumvalue suffix="UNKNOWN" value="0">
+ <tp:docstring>
+ The device metered status is unknown.
+ </tp:docstring>
+ </tp:enumvalue>
+ <tp:enumvalue suffix="YES" value="1">
+ <tp:docstring>
+ The device is metered and the value was statically set.
+ </tp:docstring>
+ </tp:enumvalue>
+ <tp:enumvalue suffix="NO" value="2">
+ <tp:docstring>
+ The device is not metered and the value was statically set.
+ </tp:docstring>
+ </tp:enumvalue>
+ <tp:enumvalue suffix="GUESS_YES" value="3">
+ <tp:docstring>
+ The device is metered and the value was guessed.
+ </tp:docstring>
+ </tp:enumvalue>
+ <tp:enumvalue suffix="GUESS_NO" value="4">
+ <tp:docstring>
+ The device is not metered and the value was guessed.
+ </tp:docstring>
+ </tp:enumvalue>
</tp:enum>
<tp:struct name="NM_DEVICE_STATE_REASON_STRUCT">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.13.0/src/dbus/introspection/nm-ip4-config.xml
new/networkmanager-qt-5.14.0/src/dbus/introspection/nm-ip4-config.xml
--- old/networkmanager-qt-5.13.0/src/dbus/introspection/nm-ip4-config.xml
2015-08-04 12:12:12.000000000 +0200
+++ new/networkmanager-qt-5.14.0/src/dbus/introspection/nm-ip4-config.xml
2015-09-04 22:22:05.000000000 +0200
@@ -2,22 +2,46 @@
<node name="/"
xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";>
<interface name="org.freedesktop.NetworkManager.IP4Config">
- <property name="Gateway" type="s" access="read">
- <tp:docstring>The gateway in use.</tp:docstring>
- </property>
<property name="Addresses" type="aau" access="read">
<annotation name="org.qtproject.QtDBus.QtTypeName" value="UIntListList"/>
- <tp:docstring>Array of tuples of IPv4 address/prefix/gateway. All 3
- elements of each tuple are in network byte order. Essentially:
- [(addr, prefix, gateway), (addr, prefix, gateway), ...]
+ <tp:docstring>
+ Array of arrays of IPv4 address/prefix/gateway. All 3
+ elements of each array are in network byte order. Essentially:
+ [(addr, prefix, gateway), (addr, prefix, gateway), ...]
+
+ Deprecated: use AddressData and Gateway
</tp:docstring>
</property>
+ <property name="AddressData" type="aa{sv}" access="read">
+ <annotation name="org.qtproject.QtDBus.QtTypeName"
value="NMVariantMapList"/>
+ <tp:docstring>
+ Array of IP address data objects. All addresses will include
+ "address" (an IP address string), and "prefix" (a uint). Some
+ addresses may include additional attributes.
+ </tp:docstring>
+ </property>
+ <property name="Gateway" type="s" access="read">
+ <tp:docstring>The gateway in use.</tp:docstring>
+ </property>
<property name="Routes" type="aau" access="read">
<annotation name="org.qtproject.QtDBus.QtTypeName" value="UIntListList"/>
- <tp:docstring>Tuples of IPv4 route/prefix/next-hop/metric. All 4
elements
- of each tuple are in network byte order. 'route' and 'next hop' are IPv4
- addresses, while prefix and metric are simple unsigned integers.
Essentially:
- [(route, prefix, next-hop, metric), (route, prefix, next-hop, metric),
...]
+ <tp:docstring>
+ Arrays of IPv4 route/prefix/next-hop/metric. All 4 elements of
+ each tuple are in network byte order. 'route' and 'next hop'
+ are IPv4 addresses, while prefix and metric are simple
+ unsigned integers. Essentially: [(route, prefix, next-hop,
+ metric), (route, prefix, next-hop, metric), ...]
+
+ Deprecated: use RouteData
+ </tp:docstring>
+ </property>
+ <property name="RouteData" type="aa{sv}" access="read">
+ <annotation name="org.qtproject.QtDBus.QtTypeName"
value="NMVariantMapList"/>
+ <tp:docstring>
+ Array of IP route data objects. All routes will include "dest"
+ (an IP address string) and "prefix" (a uint). Some routes may
+ include "next-hop" (an IP address string), "metric" (a uint),
+ and additional attributes.
</tp:docstring>
</property>
<property name="Nameservers" type="au" access="read">
@@ -30,14 +54,21 @@
<property name="Searches" type="as" access="read">
<tp:docstring>A list of dns searches.</tp:docstring>
</property>
+ <property name="DnsOptions" type="as" access="read">
+ <tp:docstring>
+ A list of DNS options that modify the behavior of the DNS
+ resolver. See resolv.conf(5) manual page for the list of
+ supported options.
+ </tp:docstring>
+ </property>
<property name="WinsServers" type="au" access="read">
<annotation name="org.qtproject.QtDBus.QtTypeName" value="UIntList"/>
<tp:docstring>The Windows Internet Name Service servers associated with
the connection. Each address is in network byte order.</tp:docstring>
</property>
<signal name="PropertiesChanged">
- <annotation name="org.qtproject.QtDBus.QtTypeName.In0"
value="QVariantMap"/>
<arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In0"
value="QVariantMap"/>
<tp:docstring>
A dictionary mapping property names to variant boxed values
</tp:docstring>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.13.0/src/dbus/introspection/nm-ip6-config.xml
new/networkmanager-qt-5.14.0/src/dbus/introspection/nm-ip6-config.xml
--- old/networkmanager-qt-5.13.0/src/dbus/introspection/nm-ip6-config.xml
2015-08-04 12:12:12.000000000 +0200
+++ new/networkmanager-qt-5.14.0/src/dbus/introspection/nm-ip6-config.xml
2015-09-04 22:22:05.000000000 +0200
@@ -2,19 +2,48 @@
<node name="/"
xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";>
<interface name="org.freedesktop.NetworkManager.IP6Config">
- <property name="Gateway" type="s" access="read">
- <tp:docstring>The gateway in use.</tp:docstring>
- </property>
<property name="Addresses" type="a(ayuay)" access="read">
<annotation name="org.qtproject.QtDBus.QtTypeName"
value="IpV6DBusAddressList"/>
- <tp:docstring>Tuples of IPv6 address/prefix/gateway.</tp:docstring>
+ <tp:docstring>
+ Array of tuples of IPv6 address/prefix/gateway.
+
+ Deprecated: use AddressData and Gateway.
+ </tp:docstring>
+ </property>
+ <property name="AddressData" type="aa{sv}" access="read">
+ <annotation name="org.qtproject.QtDBus.QtTypeName"
value="NMVariantMapList"/>
+ <tp:docstring>
+ Array of IP address data objects. All addresses will include
+ "address" (an IP address string), and "prefix" (a uint). Some
+ addresses may include additional attributes.
+ </tp:docstring>
+ </property>
+ <property name="Gateway" type="s" access="read">
+ <tp:docstring>The gateway in use.</tp:docstring>
</property>
<property name="Routes" type="a(ayuayu)" access="read">
<annotation name="org.qtproject.QtDBus.QtTypeName"
value="IpV6DBusRouteList"/>
- <tp:docstring>Tuples of IPv6 route/prefix/next-hop/metric.</tp:docstring>
+ <tp:docstring>
+ Tuples of IPv6 route/prefix/next-hop/metric.
+
+ Deprecated: use RouteData
+ </tp:docstring>
+ </property>
+ <property name="RouteData" type="aa{sv}" access="read">
+ <annotation name="org.qtproject.QtDBus.QtTypeName"
value="NMVariantMapList"/>
+ <tp:docstring>
+ Array of IP route data objects. All routes will include "dest"
+ (an IP address string) and "prefix" (a uint). Some routes may
+ include "next-hop" (an IP address string), "metric" (a uint),
+ and additional attributes.
+ </tp:docstring>
</property>
<property name="Nameservers" type="aay" access="read">
<annotation name="org.qtproject.QtDBus.QtTypeName"
value="IpV6DBusNameservers"/>
+ <!-- gdbus-codegen assumes that "aay" means "array of non-UTF-8
+ string" and so would make this a char **.
+ -->
+ <annotation name="org.gtk.GDBus.C.ForceGVariant" value="1"/>
<tp:docstring>The nameservers in use.</tp:docstring>
</property>
<property name="Domains" type="as" access="read">
@@ -23,10 +52,17 @@
<property name="Searches" type="as" access="read">
<tp:docstring>A list of dns searches.</tp:docstring>
</property>
+ <property name="DnsOptions" type="as" access="read">
+ <tp:docstring>
+ A list of DNS options that modify the behavior of the DNS
+ resolver. See resolv.conf(5) manual page for the list of
+ supported options.
+ </tp:docstring>
+ </property>
<signal name="PropertiesChanged">
- <annotation name="org.qtproject.QtDBus.QtTypeName.In0"
value="QVariantMap"/>
<arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In0"
value="QVariantMap"/>
<tp:docstring>
A dictionary mapping property names to variant boxed values
</tp:docstring>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.13.0/src/dbus/introspection/nm-manager.xml
new/networkmanager-qt-5.14.0/src/dbus/introspection/nm-manager.xml
--- old/networkmanager-qt-5.13.0/src/dbus/introspection/nm-manager.xml
2015-08-04 12:12:12.000000000 +0200
+++ new/networkmanager-qt-5.14.0/src/dbus/introspection/nm-manager.xml
2015-09-04 22:22:05.000000000 +0200
@@ -335,6 +335,14 @@
</tp:docstring>
</property>
+ <property name="Metered" type="u" access="read" tp:type="NM_METERED">
+ <tp:docstring>
+ Indicates whether the connectivity is metered. This is equivalent
+ to the metered property of the device associated with the primary
+ connection.
+ </tp:docstring>
+ </property>
+
<property name="ActivatingConnection" type="o" access="read">
<tp:docstring>
The object path of an active connection that is currently
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.13.0/src/dbus/nm-access-pointinterface.h
new/networkmanager-qt-5.14.0/src/dbus/nm-access-pointinterface.h
--- old/networkmanager-qt-5.13.0/src/dbus/nm-access-pointinterface.h
2015-08-04 12:12:12.000000000 +0200
+++ new/networkmanager-qt-5.14.0/src/dbus/nm-access-pointinterface.h
2015-09-04 22:22:05.000000000 +0200
@@ -98,6 +98,12 @@
return qvariant_cast< uint >(property("WpaFlags"));
}
+ Q_PROPERTY(int LastSeen READ lastSeen)
+ inline int lastSeen() const
+ {
+ return qvariant_cast< int >(property("LastSeen"));
+ }
+
public Q_SLOTS: // METHODS
Q_SIGNALS: // SIGNALS
void PropertiesChanged(const QVariantMap &properties);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.13.0/src/dbus/nm-deviceinterface.h
new/networkmanager-qt-5.14.0/src/dbus/nm-deviceinterface.h
--- old/networkmanager-qt-5.13.0/src/dbus/nm-deviceinterface.h 2015-08-04
12:12:12.000000000 +0200
+++ new/networkmanager-qt-5.14.0/src/dbus/nm-deviceinterface.h 2015-09-04
22:22:05.000000000 +0200
@@ -71,6 +71,12 @@
return qvariant_cast< uint >(property("Capabilities"));
}
+ Q_PROPERTY(bool NmPluginMissing READ nmPluginMissing)
+ inline bool nmPluginMissing() const
+ {
+ return qvariant_cast< bool >(property("NmPluginMissing"));
+ }
+
Q_PROPERTY(uint DeviceType READ deviceType)
inline uint deviceType() const
{
@@ -155,6 +161,12 @@
return qvariant_cast< uint >(property("Mtu"));
}
+ Q_PROPERTY(uint Metered READ metered)
+ inline uint metered() const
+ {
+ return qvariant_cast< uint >(property("Metered"));
+ }
+
Q_PROPERTY(QString PhysicalPortId READ physicalPortId)
inline QString physicalPortId() const
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.13.0/src/dbus/nm-ip4-configinterface.h
new/networkmanager-qt-5.14.0/src/dbus/nm-ip4-configinterface.h
--- old/networkmanager-qt-5.13.0/src/dbus/nm-ip4-configinterface.h
2015-08-04 12:12:12.000000000 +0200
+++ new/networkmanager-qt-5.14.0/src/dbus/nm-ip4-configinterface.h
2015-09-04 22:22:05.000000000 +0200
@@ -50,6 +50,12 @@
return qvariant_cast< UIntListList >(property("Addresses"));
}
+ Q_PROPERTY(NMVariantMapList AddressData READ addressData)
+ inline NMVariantMapList addressData() const
+ {
+ return qvariant_cast< NMVariantMapList >(property("AddressData"));
+ }
+
Q_PROPERTY(QStringList Domains READ domains)
inline QStringList domains() const
{
@@ -74,6 +80,12 @@
return qvariant_cast< UIntListList >(property("Routes"));
}
+ Q_PROPERTY(NMVariantMapList RouteData READ routeData)
+ inline NMVariantMapList routeData() const
+ {
+ return qvariant_cast< NMVariantMapList >(property("RouteData"));
+ }
+
Q_PROPERTY(QStringList Searches READ searches)
inline QStringList searches() const
{
@@ -86,6 +98,12 @@
return qvariant_cast< UIntList >(property("WinsServers"));
}
+ Q_PROPERTY(QStringList DnsOptions READ dnsOptions)
+ inline QStringList dnsOptions() const
+ {
+ return qvariant_cast< QStringList >(property("DnsOptions"));
+ }
+
public Q_SLOTS: // METHODS
Q_SIGNALS: // SIGNALS
void PropertiesChanged(const QVariantMap &properties);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.13.0/src/dbus/nm-ip6-configinterface.h
new/networkmanager-qt-5.14.0/src/dbus/nm-ip6-configinterface.h
--- old/networkmanager-qt-5.13.0/src/dbus/nm-ip6-configinterface.h
2015-08-04 12:12:12.000000000 +0200
+++ new/networkmanager-qt-5.14.0/src/dbus/nm-ip6-configinterface.h
2015-09-04 22:22:05.000000000 +0200
@@ -49,6 +49,12 @@
return qvariant_cast< IpV6DBusAddressList >(property("Addresses"));
}
+ Q_PROPERTY(NMVariantMapList AddressData READ addressData)
+ inline NMVariantMapList addressData() const
+ {
+ return qvariant_cast< NMVariantMapList >(property("AddressData"));
+ }
+
Q_PROPERTY(QStringList Domains READ domains)
inline QStringList domains() const
{
@@ -73,12 +79,24 @@
return qvariant_cast< IpV6DBusRouteList >(property("Routes"));
}
+ Q_PROPERTY(NMVariantMapList RouteData READ routeData)
+ inline NMVariantMapList routeData() const
+ {
+ return qvariant_cast< NMVariantMapList >(property("RouteData"));
+ }
+
Q_PROPERTY(QStringList Searches READ searches)
inline QStringList searches() const
{
return qvariant_cast< QStringList >(property("Searches"));
}
+ Q_PROPERTY(QStringList DnsOptions READ dnsOptions)
+ inline QStringList dnsOptions() const
+ {
+ return qvariant_cast< QStringList >(property("DnsOptions"));
+ }
+
public Q_SLOTS: // METHODS
Q_SIGNALS: // SIGNALS
void PropertiesChanged(const QVariantMap &properties);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.13.0/src/dbus/nm-managerinterface.h
new/networkmanager-qt-5.14.0/src/dbus/nm-managerinterface.h
--- old/networkmanager-qt-5.13.0/src/dbus/nm-managerinterface.h 2015-08-04
12:12:12.000000000 +0200
+++ new/networkmanager-qt-5.14.0/src/dbus/nm-managerinterface.h 2015-09-04
22:22:05.000000000 +0200
@@ -62,6 +62,12 @@
return qvariant_cast< QList<QDBusObjectPath>
>(property("ActiveConnections"));
}
+ Q_PROPERTY(uint Metered READ metered)
+ inline uint metered() const
+ {
+ return qvariant_cast< uint >(property("Metered"));
+ }
+
Q_PROPERTY(uint Connectivity READ connectivity)
inline uint connectivity() const
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.13.0/src/device.cpp
new/networkmanager-qt-5.14.0/src/device.cpp
--- old/networkmanager-qt-5.13.0/src/device.cpp 2015-08-04 12:12:12.000000000
+0200
+++ new/networkmanager-qt-5.14.0/src/device.cpp 2015-09-04 22:22:05.000000000
+0200
@@ -125,6 +125,13 @@
physicalPortId = deviceIface.physicalPortId();
mtu = deviceIface.mtu();
#endif
+#if NM_CHECK_VERSION(1, 2, 0)
+ nmPluginMissing = deviceIface.nmPluginMissing();
+#endif
+#if NM_CHECK_VERSION(1, 0, 6)
+ metered =
NetworkManager::DevicePrivate::convertMeteredStatus(deviceIface.metered());
+#endif
+
QDBusObjectPath ip4ConfigObjectPath = deviceIface.ip4Config();
if (!ip4ConfigObjectPath.path().isNull() || ip4ConfigObjectPath.path() !=
QLatin1String("/")) {
ipV4ConfigPath = ip4ConfigObjectPath.path();
@@ -167,6 +174,14 @@
QObject::connect(&deviceIface,
&OrgFreedesktopNetworkManagerDeviceInterface::StateChanged, this,
&DevicePrivate::deviceStateChanged);
}
+#if NM_CHECK_VERSION(1, 0, 6)
+NetworkManager::Device::MeteredStatus
NetworkManager::DevicePrivate::convertMeteredStatus(uint metered)
+{
+ NetworkManager::Device::MeteredStatus ourMeteredStatus =
(NetworkManager::Device::MeteredStatus) metered;
+ return ourMeteredStatus;
+}
+#endif
+
NetworkManager::Device::Capabilities
NetworkManager::DevicePrivate::convertCapabilities(uint theirCaps)
{
NetworkManager::Device::Capabilities ourCaps
@@ -329,6 +344,16 @@
mtu = value.toUInt();
Q_EMIT q->mtuChanged();
#endif
+#if NM_CHECK_VERSION(1, 2, 0)
+ } else if (property == QLatin1String("NmPluginMissing")) {
+ nmPluginMissing = value.toBool();
+ Q_EMIT q->nmPluginMissingChanged(nmPluginMissing);
+ } else if (property == QLatin1String("Metered")) {
+#endif
+#if NM_CHECK_VERSION(1, 0, 6)
+ metered =
NetworkManager::DevicePrivate::convertMeteredStatus(value.toUInt());
+ Q_EMIT q->meteredChanged(metered);
+#endif
} else {
qCWarning(NMQT) << Q_FUNC_INFO << "Unhandled property" << property;
}
@@ -506,6 +531,23 @@
}
#endif
+#if NM_CHECK_VERSION(1, 2, 0)
+bool NetworkManager::Device::nmPluginMissing() const
+{
+ Q_D(const Device);
+ return d->nmPluginMissing;
+
+}
+#endif
+
+#if NM_CHECK_VERSION(1, 0, 6)
+NetworkManager::Device::MeteredStatus NetworkManager::Device::metered() const
+{
+ Q_D(const Device);
+ return d->metered;
+}
+#endif
+
QDBusPendingReply<> NetworkManager::Device::disconnectInterface()
{
Q_D(Device);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.13.0/src/device.h
new/networkmanager-qt-5.14.0/src/device.h
--- old/networkmanager-qt-5.13.0/src/device.h 2015-08-04 12:12:12.000000000
+0200
+++ new/networkmanager-qt-5.14.0/src/device.h 2015-09-04 22:22:05.000000000
+0200
@@ -64,6 +64,12 @@
#if NM_CHECK_VERSION(0, 9, 10)
Q_PROPERTY(uint mtu READ mtu)
#endif
+#if NM_CHECK_VERSION(1, 2, 0)
+ Q_PROPERTY(bool nmPluginMissing READ nmPluginMissing)
+#endif
+#if NM_CHECK_VERSION(1, 0, 6)
+ Q_PROPERTY(MeteredStatus metered READ metered)
+#endif
Q_PROPERTY(QString udi READ udi)
Q_PROPERTY(bool firmwareMissing READ firmwareMissing)
Q_PROPERTY(bool autoconnect READ autoconnect WRITE setAutoconnect)
@@ -120,8 +126,22 @@
#if NM_CHECK_VERSION(0, 9, 10)
DcbFcoeFailed = 55, TeamdControlFailed = 56,
ModemFailed = 57, ModemAvailable = 58, SimPinIncorrect = 59,
#endif
+#if NM_CHECK_VERSION(1, 0, 4)
+ NewActivation = 60, ParentChanged = 61,
ParentManagedChanged = 62,
+#endif
Reserved = 65536
};
+
+#if NM_CHECK_VERSION(1, 0, 6)
+ enum MeteredStatus {
+ UnknownStatus = 0, /**< The device metered status is unknown. */
+ Yes = 1, /**< The device is metered and the value was statically set.
*/
+ No = 2, /**< The device is not metered and the value was statically
set. */
+ GuessYes = 3, /**< The device is metered and the value was guessed. */
+ GuessNo = 4 /**< The device is not metered and the value was guessed.
*/
+ };
+#endif
+
/**
* Possible device capabilities
*/
@@ -342,6 +362,24 @@
*/
uint mtu() const;
#endif
+
+#if NM_CHECK_VERSION(1, 2, 0)
+ /**
+ * @return If TRUE, indicates the NetworkManager plugin for the device is
likely
+ * missing or misconfigured.
+ * @since 5.14.0
+ */
+ bool nmPluginMissing() const;
+#endif
+#if NM_CHECK_VERSION(1, 0 ,6)
+ /**
+ * @return Whether the amount of traffic flowing through the device is
+ * subject to limitations, for example set by service providers.
+ * @since 5.14.0
+ */
+ MeteredStatus metered() const;
+#endif
+
/**
* If true, indicates the device is allowed to autoconnect.
* If false, manual intervention is required before the device
@@ -488,6 +526,23 @@
*/
void mtuChanged();
#endif
+#if NM_CHECK_VERSION(1, 2, 0)
+ /**
+ * Emitted when NmPluginMissing property has changed
+ * @since 5.14.0
+ * @see nmPluginMissing
+ */
+ void nmPluginMissingChanged(bool nmPluginMissing);
+#endif
+#if NM_CHECK_VERSION(1, 0, 6)
+ /**
+ * Emitted when metered property has changed
+ * @since 5.14.0
+ * @see metered
+ */
+ void meteredChanged(MeteredStatus metered);
+#endif
+
/**
* Emitted when the connection state of this network has changed.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.13.0/src/device_p.h
new/networkmanager-qt-5.14.0/src/device_p.h
--- old/networkmanager-qt-5.13.0/src/device_p.h 2015-08-04 12:12:12.000000000
+0200
+++ new/networkmanager-qt-5.14.0/src/device_p.h 2015-09-04 22:22:05.000000000
+0200
@@ -69,6 +69,14 @@
#if NM_CHECK_VERSION(0, 9, 10)
uint mtu;
#endif
+#if NM_CHECK_VERSION(1, 2, 0)
+ bool nmPluginMissing;
+#endif
+#if NM_CHECK_VERSION(1, 0, 6)
+ Device::MeteredStatus metered;
+
+ static NetworkManager::Device::MeteredStatus convertMeteredStatus(uint);
+#endif
static NetworkManager::Device::Capabilities convertCapabilities(uint);
static NetworkManager::Device::State convertState(uint);
static NetworkManager::Device::StateChangeReason convertReason(uint);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.13.0/src/generictypes.h
new/networkmanager-qt-5.14.0/src/generictypes.h
--- old/networkmanager-qt-5.13.0/src/generictypes.h 2015-08-04
12:12:12.000000000 +0200
+++ new/networkmanager-qt-5.14.0/src/generictypes.h 2015-09-04
22:22:05.000000000 +0200
@@ -25,6 +25,8 @@
#include <networkmanagerqt/networkmanagerqt_export.h>
+#include <nm-version.h>
+
#include <QtCore/QVariantMap>
#include <QDBusArgument>
@@ -37,6 +39,9 @@
typedef QMap<QString, QVariantMap> NMVariantMapMap;
Q_DECLARE_METATYPE(NMVariantMapMap)
+typedef QList<QVariantMap> NMVariantMapList;
+Q_DECLARE_METATYPE(NMVariantMapList)
+
typedef QMap<QString, QString> NMStringMap;
typedef QMapIterator<QString, QString> NMStringMapIterator;
Q_DECLARE_METATYPE(NMStringMap)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.13.0/src/ipconfig.cpp
new/networkmanager-qt-5.14.0/src/ipconfig.cpp
--- old/networkmanager-qt-5.13.0/src/ipconfig.cpp 2015-08-04
12:12:12.000000000 +0200
+++ new/networkmanager-qt-5.14.0/src/ipconfig.cpp 2015-09-04
22:22:05.000000000 +0200
@@ -53,6 +53,9 @@
QList<QHostAddress> nameservers;
QStringList domains;
IpRoutes routes;
+#if NM_CHECK_VERSION(1, 2, 0)
+ QStringList dnsOptions;
+#endif
};
}
@@ -87,6 +90,41 @@
#endif
// TODO - watch propertiesChanged signal
+#if NM_CHECK_VERSION(1, 0, 0)
+ NMVariantMapList addresses = iface.addressData();
+ QList<NetworkManager::IpAddress> addressObjects;
+ Q_FOREACH (const QVariantMap &addressList, addresses) {
+ if (addressList.contains(QLatin1String("address")) &&
+ addressList.contains(QLatin1String("prefix"))) {
+ NetworkManager::IpAddress address;
+
address.setIp(QHostAddress(addressList.value(QLatin1String("address")).toString()));
+
address.setPrefixLength(addressList.value(QLatin1String("prefix")).toUInt());
+ if (addressList.contains(QLatin1String("gateway"))) {
+
address.setGateway(QHostAddress(addressList.value(QLatin1String("gateway")).toString()));
+ }
+ addressObjects << address;
+ }
+ }
+
+ NMVariantMapList routes = iface.routeData();
+ QList<NetworkManager::IpRoute> routeObjects;
+ Q_FOREACH (const QVariantMap &routeList, routes) {
+ if (routeList.contains(QLatin1String("address")) &&
+ routeList.contains(QLatin1String("prefix"))) {
+ NetworkManager::IpRoute route;
+
route.setIp(QHostAddress(routeList.value(QLatin1String("address")).toString()));
+
route.setPrefixLength(routeList.value(QLatin1String("prefix")).toUInt());
+ if (routeList.contains(QLatin1String("next-hop"))) {
+
route.setNextHop(QHostAddress(routeList.value(QLatin1String("next-hop")).toString()));
+ }
+
+ if (routeList.contains(QLatin1String("metric"))) {
+
route.setMetric(routeList.value(QLatin1String("metric")).toUInt());
+ }
+ routeObjects << route;
+ }
+ }
+#else
//convert ipaddresses into object
UIntListList addresses = iface.addresses();
QList<NetworkManager::IpAddress> addressObjects;
@@ -112,6 +150,7 @@
routeObjects << route;
}
}
+#endif
// nameservers' IP addresses are always in network byte order
QList<QHostAddress> nameservers;
Q_FOREACH (uint nameserver, iface.nameservers()) {
@@ -119,13 +158,16 @@
}
d->addresses = addressObjects;
+ d->routes = routeObjects;
+ d->nameservers = nameservers;
#if NM_CHECK_VERSION(0, 9, 10)
d->gateway = iface.gateway();
d->searches = iface.searches();
#endif
- d->nameservers = nameservers;
d->domains = iface.domains();
- d->routes = routeObjects;
+#if NM_CHECK_VERSION(1, 2, 0)
+ d->dnsOptions = iface.dnsOptions();
+#endif
}
void NetworkManager::IpConfig::setIPv6Path(const QString &path)
@@ -140,6 +182,41 @@
#endif
// TODO - watch propertiesChanged signal
+#if NM_CHECK_VERSION(1, 0, 0)
+ NMVariantMapList addresses = iface.addressData();
+ QList<NetworkManager::IpAddress> addressObjects;
+ Q_FOREACH (const QVariantMap &addressList, addresses) {
+ if (addressList.contains(QLatin1String("address")) &&
+ addressList.contains(QLatin1String("prefix"))) {
+ NetworkManager::IpAddress address;
+
address.setIp(QHostAddress(addressList.value(QLatin1String("address")).toString()));
+
address.setPrefixLength(addressList.value(QLatin1String("prefix")).toUInt());
+ if (addressList.contains(QLatin1String("gateway"))) {
+
address.setGateway(QHostAddress(addressList.value(QLatin1String("gateway")).toString()));
+ }
+ addressObjects << address;
+ }
+ }
+
+ NMVariantMapList routes = iface.routeData();
+ QList<NetworkManager::IpRoute> routeObjects;
+ Q_FOREACH (const QVariantMap &routeList, routes) {
+ if (routeList.contains(QLatin1String("address")) &&
+ routeList.contains(QLatin1String("prefix"))) {
+ NetworkManager::IpRoute route;
+
route.setIp(QHostAddress(routeList.value(QLatin1String("address")).toString()));
+
route.setPrefixLength(routeList.value(QLatin1String("prefix")).toUInt());
+ if (routeList.contains(QLatin1String("next-hop"))) {
+
route.setNextHop(QHostAddress(routeList.value(QLatin1String("next-hop")).toString()));
+ }
+
+ if (routeList.contains(QLatin1String("metric"))) {
+
route.setMetric(routeList.value(QLatin1String("metric")).toUInt());
+ }
+ routeObjects << route;
+ }
+ }
+#else
IpV6DBusAddressList addresses = iface.addresses();
QList<NetworkManager::IpAddress> addressObjects;
Q_FOREACH (const IpV6DBusAddress & address, addresses) {
@@ -176,6 +253,7 @@
routeEntry.setMetric(route.metric);
routeObjects << routeEntry;
}
+#endif
QList<QHostAddress> nameservers;
Q_FOREACH (const QByteArray & nameserver, iface.nameservers()) {
@@ -187,13 +265,16 @@
}
d->addresses = addressObjects;
+ d->routes = routeObjects;
+ d->nameservers = nameservers;
#if NM_CHECK_VERSION(0, 9, 10)
d->gateway = iface.gateway();
d->searches = iface.searches();
#endif
- d->nameservers = nameservers;
d->domains = iface.domains();
- d->routes = routeObjects;
+#if NM_CHECK_VERSION(1, 2, 0)
+ d->dnsOptions = iface.dnsOptions();
+#endif
}
NetworkManager::IpConfig::~IpConfig()
@@ -235,6 +316,13 @@
}
#endif
+#if NM_CHECK_VERSION(1, 2, 0)
+QStringList NetworkManager::IpConfig::dnsOptions() const
+{
+ return d->dnsOptions;
+}
+#endif
+
NetworkManager::IpConfig &NetworkManager::IpConfig::operator=(const IpConfig
&other)
{
if (this == &other) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.13.0/src/ipconfig.h
new/networkmanager-qt-5.14.0/src/ipconfig.h
--- old/networkmanager-qt-5.13.0/src/ipconfig.h 2015-08-04 12:12:12.000000000
+0200
+++ new/networkmanager-qt-5.14.0/src/ipconfig.h 2015-09-04 22:22:05.000000000
+0200
@@ -117,6 +117,15 @@
*/
QStringList searches() const;
#endif
+
+#if NM_CHECK_VERSION(1, 2, 0)
+ /**
+ * Returns a list of DNS options that modify the behaviour of the DNS
resolver.
+ * @since 5.14.0
+ */
+ QStringList dnsOptions() const;
+#endif
+
/**
* Makes a copy of the IpConfig object @p other.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.13.0/src/manager.cpp
new/networkmanager-qt-5.14.0/src/manager.cpp
--- old/networkmanager-qt-5.13.0/src/manager.cpp 2015-08-04
12:12:12.000000000 +0200
+++ new/networkmanager-qt-5.14.0/src/manager.cpp 2015-09-04
22:22:05.000000000 +0200
@@ -134,6 +134,7 @@
qDBusRegisterMetaType<QList<QDBusObjectPath> >();
qDBusRegisterMetaType<DeviceDBusStateReason>();
qDBusRegisterMetaType<NMVariantMapMap>();
+ qDBusRegisterMetaType<NMVariantMapList>();
qDBusRegisterMetaType<NMStringMap>();
m_version = iface.version();
@@ -640,6 +641,13 @@
}
#endif
+#if NM_CHECK_VERSION(1, 0, 6)
+NetworkManager::Device::MeteredStatus
NetworkManager::NetworkManagerPrivate::metered() const
+{
+ return m_metered;
+}
+#endif
+
void NetworkManager::NetworkManagerPrivate::onDeviceAdded(const
QDBusObjectPath &objpath)
{
// qCDebug(NMQT);
@@ -759,6 +767,11 @@
} else if (property == QLatin1String("Startup")) {
Q_EMIT isStartingUpChanged();
#endif
+#if NM_CHECK_VERSION(1, 0, 6)
+ } else if (property == QLatin1String("Metered")) {
+ m_metered = (NetworkManager::Device::MeteredStatus)it->toUInt();
+ Q_EMIT meteredChanged(m_metered);
+#endif
} else {
qCWarning(NMQT) << Q_FUNC_INFO << "Unhandled property" << property;
}
@@ -1074,6 +1087,13 @@
}
#endif
+#if NM_CHECK_VERSION(1, 0, 6)
+NetworkManager::Device::MeteredStatus NetworkManager::metered()
+{
+ return globalNetworkManager->metered();
+}
+#endif
+
NetworkManager::Notifier *NetworkManager::notifier()
{
return globalNetworkManager;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.13.0/src/manager.h
new/networkmanager-qt-5.14.0/src/manager.h
--- old/networkmanager-qt-5.13.0/src/manager.h 2015-08-04 12:12:12.000000000
+0200
+++ new/networkmanager-qt-5.14.0/src/manager.h 2015-09-04 22:22:05.000000000
+0200
@@ -197,6 +197,15 @@
*/
void isStartingUpChanged();
#endif
+
+#if NM_CHECK_VERSION(1, 0, 6)
+ /**
+ * Emitted when metered property has changed
+ * @since 5.14.0
+ * @see metered
+ */
+ void meteredChanged(NetworkManager::Device::MeteredStatus metered);
+#endif
};
/**
@@ -380,6 +389,14 @@
NETWORKMANAGERQT_EXPORT bool isStartingUp();
#endif
+#if NM_CHECK_VERSION(1, 0, 6)
+ /**
+ * @return Indicates whether the connectivity is metered.
+ * @since 5.14.0
+ */
+NETWORKMANAGERQT_EXPORT NetworkManager::Device::MeteredStatus metered();
+#endif
+
/**
* Find an ActiveConnection object for an active connection id
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.13.0/src/manager_p.h
new/networkmanager-qt-5.14.0/src/manager_p.h
--- old/networkmanager-qt-5.13.0/src/manager_p.h 2015-08-04
12:12:12.000000000 +0200
+++ new/networkmanager-qt-5.14.0/src/manager_p.h 2015-09-04
22:22:05.000000000 +0200
@@ -66,6 +66,9 @@
#if NM_CHECK_VERSION(1, 0, 0)
NetworkManager::ConnectionSettings::ConnectionType m_primaryConnectionType;
#endif
+#if NM_CHECK_VERSION(1, 0, 6)
+ NetworkManager::Device::MeteredStatus m_metered;
+#endif
QString m_version;
// to store NetworkManager's version.
int m_x;
@@ -121,6 +124,9 @@
#if NM_CHECK_VERSION(0, 9, 10)
bool isStartingUp() const;
#endif
+#if NM_CHECK_VERSION(1, 0, 6)
+ NetworkManager::Device::MeteredStatus metered() const;
+#endif
protected Q_SLOTS:
void init();
void onDeviceAdded(const QDBusObjectPath &state);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.13.0/src/wirelessdevice.h
new/networkmanager-qt-5.14.0/src/wirelessdevice.h
--- old/networkmanager-qt-5.13.0/src/wirelessdevice.h 2015-08-04
12:12:12.000000000 +0200
+++ new/networkmanager-qt-5.14.0/src/wirelessdevice.h 2015-09-04
22:22:05.000000000 +0200
@@ -70,7 +70,13 @@
Wpa = 0x10, /**< WPA authentication protocol */
Rsn = 0x20, /**< RSN authethication protocol */
ApCap = 0x40, /**< The device supports Access Point mode. */
- AdhocCap = 0x80 /**< The device supports Ad-Hoc mode. */
+ AdhocCap = 0x80, /**< The device supports Ad-Hoc mode. */
+#if NM_CHECK_VERSION(1, 0, 2)
+ FreqValid = 0x100, /**< The device properly reports information about
supported frequencies */
+ Freq2Ghz = 0x200, /**< The device supports 2.4Ghz frequencies */
+ Freq5Ghz = 0x400 /**< The device supports 5Ghz frequencies */
+#endif
+
};
Q_DECLARE_FLAGS(Capabilities, Capability)
/**
