Hello community,
here is the log from the commit of package libKF5NetworkManagerQt for
openSUSE:Factory checked in at 2015-03-16 09:35:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-02-16 17:33:11.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new/libKF5NetworkManagerQt.changes
2015-03-16 09:35:14.000000000 +0100
@@ -1,0 +2,8 @@
+Sat Mar 7 16:59:01 UTC 2015 - [email protected]
+
+- Update to 5.8.0
+ * Add new properties and methods from NetworkManager 1.0.0
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.8.0.php
+
+-------------------------------------------------------------------
Old:
----
networkmanager-qt-5.7.0.tar.xz
New:
----
networkmanager-qt-5.8.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libKF5NetworkManagerQt.spec ++++++
--- /var/tmp/diff_new_pack.Vn1DHN/_old 2015-03-16 09:35:15.000000000 +0100
+++ /var/tmp/diff_new_pack.Vn1DHN/_new 2015-03-16 09:35:15.000000000 +0100
@@ -17,7 +17,7 @@
%define soversion 6
-%define _tar_path 5.7
+%define _tar_path 5.8
Name: libKF5NetworkManagerQt
Version: %{_tar_path}.0
Release: 0
@@ -28,7 +28,7 @@
Source:
http://download.kde.org/stable/frameworks/%{_tar_path}/networkmanager-qt-%{version}.tar.xz
Source1: baselibs.conf
BuildRequires: cmake
-BuildRequires: extra-cmake-modules >= 1.7.0
+BuildRequires: extra-cmake-modules >= 1.8.0
BuildRequires: kf5-filesystem
BuildRequires: pkgconfig(NetworkManager) >= 0.9.8.4
BuildRequires: pkgconfig(Qt5Core) >= 5.2.0
++++++ networkmanager-qt-5.7.0.tar.xz -> networkmanager-qt-5.8.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.7.0/CMakeLists.txt
new/networkmanager-qt-5.8.0/CMakeLists.txt
--- old/networkmanager-qt-5.7.0/CMakeLists.txt 2015-01-23 21:43:41.000000000
+0100
+++ new/networkmanager-qt-5.8.0/CMakeLists.txt 2015-03-06 16:13:35.000000000
+0100
@@ -2,7 +2,7 @@
project(NetworkManagerQt)
-find_package(ECM 1.7.0 REQUIRED NO_MODULE)
+find_package(ECM 1.8.0 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake
${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
@@ -28,7 +28,7 @@
include(ECMSetupVersion)
include(ECMGenerateHeaders)
-set(KF5_VERSION "5.7.0") # handled by release scripts
+set(KF5_VERSION "5.8.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.7.0/src/CMakeLists.txt
new/networkmanager-qt-5.8.0/src/CMakeLists.txt
--- old/networkmanager-qt-5.7.0/src/CMakeLists.txt 2015-01-23
21:43:41.000000000 +0100
+++ new/networkmanager-qt-5.8.0/src/CMakeLists.txt 2015-03-06
16:13:35.000000000 +0100
@@ -148,6 +148,12 @@
EXPORT_NAME NetworkManagerQt
)
+if (${NETWORKMANAGER_VERSION} VERSION_EQUAL 1.0.0 OR ${NETWORKMANAGER_VERSION}
VERSION_GREATER 1.0.0)
+ target_include_directories(KF5NetworkManagerQt PUBLIC
${NM-CORE_INCLUDE_DIRS})
+else()
+ target_include_directories(KF5NetworkManagerQt PUBLIC
${NETWORKMANAGER_INCLUDE_DIRS} ${NM-UTIL_INCLUDE_DIRS} ${NM-GLIB_INCLUDE_DIRS})
+endif()
+
########### static lib for tests ###############
add_library(KF5NetworkManagerQt_static STATIC ${NetworkManagerQt_PART_SRCS}
${NetworkManagerQt_SETTINGS_SRCS} ${DBUS_INTERFACE_SRCS})
set_target_properties(KF5NetworkManagerQt_static PROPERTIES COMPILE_FLAGS
-DNMQT_STATIC=1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.7.0/src/connection.cpp
new/networkmanager-qt-5.8.0/src/connection.cpp
--- old/networkmanager-qt-5.7.0/src/connection.cpp 2015-01-23
21:43:41.000000000 +0100
+++ new/networkmanager-qt-5.8.0/src/connection.cpp 2015-03-06
16:13:35.000000000 +0100
@@ -142,6 +142,15 @@
return d->iface.Save();
}
#endif
+
+#if NM_CHECK_VERSION(1, 0, 0)
+QDBusPendingReply<> NetworkManager::Connection::clearSecrets()
+{
+ Q_D(Connection);
+ return d->iface.ClearSecrets();
+}
+#endif
+
QDBusPendingReply<> NetworkManager::Connection::remove()
{
Q_D(Connection);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.7.0/src/connection.h
new/networkmanager-qt-5.8.0/src/connection.h
--- old/networkmanager-qt-5.7.0/src/connection.h 2015-01-23
21:43:41.000000000 +0100
+++ new/networkmanager-qt-5.8.0/src/connection.h 2015-03-06
16:13:35.000000000 +0100
@@ -128,6 +128,15 @@
*/
QDBusPendingReply<> save();
#endif
+
+#if NM_CHECK_VERSION(1, 0, 0)
+ /**
+ * Clear the secrets belonging to this network connection profile.
+ * @since 5.8.0
+ */
+ QDBusPendingReply<> clearSecrets();
+#endif
+
/**
* Removes the connection from NetworkManager database,
* this operation does not ask for confirmation but
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.7.0/src/dbus/introspection/nm-device-vlan.xml
new/networkmanager-qt-5.8.0/src/dbus/introspection/nm-device-vlan.xml
--- old/networkmanager-qt-5.7.0/src/dbus/introspection/nm-device-vlan.xml
2015-01-23 21:43:41.000000000 +0100
+++ new/networkmanager-qt-5.8.0/src/dbus/introspection/nm-device-vlan.xml
2015-03-06 16:13:35.000000000 +0100
@@ -15,6 +15,12 @@
</tp:docstring>
</property>
+ <property name="Parent" type="o" access="read">
+ <tp:docstring>
+ Object path of the parent device of this VLAN device.
+ </tp:docstring>
+ </property>
+
<property name="VlanId" type="u" access="read">
<tp:docstring>
The VLAN ID of this VLAN interface.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.7.0/src/dbus/introspection/nm-device.xml
new/networkmanager-qt-5.8.0/src/dbus/introspection/nm-device.xml
--- old/networkmanager-qt-5.7.0/src/dbus/introspection/nm-device.xml
2015-01-23 21:43:41.000000000 +0100
+++ new/networkmanager-qt-5.8.0/src/dbus/introspection/nm-device.xml
2015-03-06 16:13:35.000000000 +0100
@@ -148,6 +148,15 @@
</tp:docstring>
</method>
+ <method name="Delete">
+ <annotation name="org.freedesktop.DBus.GLib.CSymbol"
value="impl_device_delete"/>
+ <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+ <tp:docstring>
+ Deletes a software device from NetworkManager and removes the
interface from the system.
+ The method returns an error when called for a hardware device.
+ </tp:docstring>
+ </method>
+
<signal name="StateChanged">
<arg name="new_state" type="u" tp:type="NM_DEVICE_STATE">
<tp:docstring>
@@ -613,6 +622,21 @@
teamd control failed.
</tp:docstring>
</tp:enumvalue>
+ <tp:enumvalue suffix="MODEM_FAILED" value="57">
+ <tp:docstring>
+ Modem failed or no longer available.
+ </tp:docstring>
+ </tp:enumvalue>
+ <tp:enumvalue suffix="MODEM_AVAILABLE" value="58">
+ <tp:docstring>
+ Modem now ready and available.
+ </tp:docstring>
+ </tp:enumvalue>
+ <tp:enumvalue suffix="SIM_PIN_INCORRECT" value="59">
+ <tp:docstring>
+ The SIM PIN was incorrect.
+ </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.7.0/src/dbus/introspection/nm-manager.xml
new/networkmanager-qt-5.8.0/src/dbus/introspection/nm-manager.xml
--- old/networkmanager-qt-5.7.0/src/dbus/introspection/nm-manager.xml
2015-01-23 21:43:41.000000000 +0100
+++ new/networkmanager-qt-5.8.0/src/dbus/introspection/nm-manager.xml
2015-03-06 16:13:35.000000000 +0100
@@ -71,16 +71,6 @@
The path of the active connection object representing this active
connection.
</tp:docstring>
</arg>
- <tp:possible-errors>
- <tp:error
name="org.freedesktop.NetworkManager.Error.UnknownConnection"/>
- <tp:error name="org.freedesktop.NetworkManager.Error.UnknownDevice"/>
- <tp:error
name="org.freedesktop.NetworkManager.Error.ConnectionActivating">
- <tp:docstring>Another connection is already activating or the same
connection is already active. FIXME: check if the error name is correct.
FIXME: split into 2 errors?</tp:docstring>
- </tp:error>
- <tp:error
name="org.freedesktop.NetworkManager.Error.ConnectionInvalid">
- <tp:docstring>The connection is invalid for this
device.</tp:docstring>
- </tp:error>
- </tp:possible-errors>
</method>
<method name="AddAndActivateConnection">
@@ -124,13 +114,6 @@
The path of the active connection object representing this active
connection.
</tp:docstring>
</arg>
- <tp:possible-errors>
- <tp:error
name="org.freedesktop.NetworkManager.Error.UnknownConnection"/>
- <tp:error name="org.freedesktop.NetworkManager.Error.UnknownDevice"/>
- <tp:error
name="org.freedesktop.NetworkManager.Error.ConnectionInvalid">
- <tp:docstring>The connection is invalid for this
device.</tp:docstring>
- </tp:error>
- </tp:possible-errors>
</method>
<method name="DeactivateConnection">
@@ -217,20 +200,21 @@
</tp:docstring>
<arg name="level" type="s" direction="in">
<tp:docstring>
- One of [ERR, WARN, INFO, DEBUG].
+ One of [ERR, WARN, INFO, DEBUG, TRACE].
</tp:docstring>
</arg>
<arg name="domains" type="s" direction="in">
<tp:docstring>
A combination of logging domains separated by commas (','), or "NONE"
to disable logging. Each domain enables logging for operations
- related to that domain. Available domains are: [HW, RFKILL, ETHER,
+ related to that domain. Available domains are: [PLATFORM, RFKILL,
ETHER,
WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS,
VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE,
- OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN]. In addition to
- these domains, the following special domains can be used: [NONE, ALL,
- DEFAULT, DHCP, IP]. You can also specify that some domains should
- log at a different level from the default by appending a colon (':')
+ OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE,
DBUS_PROPS,
+ TEAM, CONCHECK, DCB, DISPATCH].
+ In addition to these domains, the following special domains can be
used:
+ [NONE, ALL, DEFAULT, DHCP, IP]. You can also specify that some
domains
+ should log at a different level from the default by appending a
colon (':')
and a log level (eg, 'WIFI:DEBUG'). If an empty string is given, the
log level is changed but the current set of log domains remains
unchanged.
@@ -245,7 +229,7 @@
</tp:docstring>
<arg name="level" type="s" direction="out">
<tp:docstring>
- One of [ERR, WARN, INFO, DEBUG].
+ One of [ERR, WARN, INFO, DEBUG, TRACE].
</tp:docstring>
</arg>
<arg name="domains" type="s" direction="out">
@@ -332,12 +316,6 @@
</tp:docstring>
</property>
- <property name="Version" type="s" access="read">
- <tp:docstring>
- NetworkManager version.
- </tp:docstring>
- </property>
-
<property name="PrimaryConnection" type="o" access="read">
<tp:docstring>
The object path of the "primary" active connection being used
@@ -349,6 +327,14 @@
</tp:docstring>
</property>
+ <property name="PrimaryConnectionType" type="s" access="read">
+ <tp:docstring>
+ The connection type of the "primary" active connection being
+ used to access the network. This is the same as the Type
+ property on the object indicated by PrimaryConnection.
+ </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.7.0/src/dbus/introspection/nm-settings-connection.xml
new/networkmanager-qt-5.8.0/src/dbus/introspection/nm-settings-connection.xml
---
old/networkmanager-qt-5.7.0/src/dbus/introspection/nm-settings-connection.xml
2015-01-23 21:43:41.000000000 +0100
+++
new/networkmanager-qt-5.8.0/src/dbus/introspection/nm-settings-connection.xml
2015-03-06 16:13:35.000000000 +0100
@@ -97,6 +97,14 @@
</arg>
</method>
+ <method name="ClearSecrets">
+ <tp:docstring>
+ Clear the secrets belonging to this network connection profile.
+ </tp:docstring>
+ <annotation name="org.freedesktop.DBus.GLib.CSymbol"
value="impl_settings_connection_clear_secrets"/>
+ <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+ </method>
+
<method name="Save">
<tp:docstring>
Saves a "dirty" connection (that had previously been
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.7.0/src/dbus/nm-device-vlaninterface.h
new/networkmanager-qt-5.8.0/src/dbus/nm-device-vlaninterface.h
--- old/networkmanager-qt-5.7.0/src/dbus/nm-device-vlaninterface.h
2015-01-23 21:43:41.000000000 +0100
+++ new/networkmanager-qt-5.8.0/src/dbus/nm-device-vlaninterface.h
2015-03-06 16:13:35.000000000 +0100
@@ -55,6 +55,12 @@
return qvariant_cast< QString >(property("HwAddress"));
}
+ Q_PROPERTY(QDBusObjectPath Parent READ parent)
+ inline QDBusObjectPath parent() const
+ {
+ return qvariant_cast< QDBusObjectPath >(property("Parent"));
+ }
+
Q_PROPERTY(uint VlanId READ vlanId)
inline uint vlanId() const
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.7.0/src/dbus/nm-deviceinterface.h
new/networkmanager-qt-5.8.0/src/dbus/nm-deviceinterface.h
--- old/networkmanager-qt-5.7.0/src/dbus/nm-deviceinterface.h 2015-01-23
21:43:41.000000000 +0100
+++ new/networkmanager-qt-5.8.0/src/dbus/nm-deviceinterface.h 2015-03-06
16:13:35.000000000 +0100
@@ -186,6 +186,11 @@
return asyncCallWithArgumentList(QLatin1String("Disconnect"),
argumentList);
}
+ inline QDBusPendingReply<> Delete()
+ {
+ QList<QVariant> argumentList;
+ return asyncCallWithArgumentList(QLatin1String("Delete"),
argumentList);
+ }
Q_SIGNALS: // SIGNALS
void StateChanged(uint new_state, uint old_state, uint reason);
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.7.0/src/dbus/nm-managerinterface.h
new/networkmanager-qt-5.8.0/src/dbus/nm-managerinterface.h
--- old/networkmanager-qt-5.7.0/src/dbus/nm-managerinterface.h 2015-01-23
21:43:41.000000000 +0100
+++ new/networkmanager-qt-5.8.0/src/dbus/nm-managerinterface.h 2015-03-06
16:13:35.000000000 +0100
@@ -44,6 +44,12 @@
~OrgFreedesktopNetworkManagerInterface();
+ Q_PROPERTY(QString PrimaryConnectionType READ primaryConnectionType)
+ inline QString primaryConnectionType() const
+ {
+ return qvariant_cast< QString >(property("PrimaryConnectionType"));
+ }
+
Q_PROPERTY(QDBusObjectPath ActivatingConnection READ activatingConnection)
inline QDBusObjectPath activatingConnection() const
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.7.0/src/dbus/nm-settings-connectioninterface.h
new/networkmanager-qt-5.8.0/src/dbus/nm-settings-connectioninterface.h
--- old/networkmanager-qt-5.7.0/src/dbus/nm-settings-connectioninterface.h
2015-01-23 21:43:41.000000000 +0100
+++ new/networkmanager-qt-5.8.0/src/dbus/nm-settings-connectioninterface.h
2015-03-06 16:13:35.000000000 +0100
@@ -70,6 +70,12 @@
return asyncCallWithArgumentList(QLatin1String("GetSettings"),
argumentList);
}
+ inline QDBusPendingReply<> ClearSecrets()
+ {
+ QList<QVariant> argumentList;
+ return asyncCallWithArgumentList(QLatin1String("ClearSecrets"),
argumentList);
+ }
+
inline QDBusPendingReply<> Save()
{
QList<QVariant> argumentList;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.7.0/src/device.cpp
new/networkmanager-qt-5.8.0/src/device.cpp
--- old/networkmanager-qt-5.7.0/src/device.cpp 2015-01-23 21:43:41.000000000
+0100
+++ new/networkmanager-qt-5.8.0/src/device.cpp 2015-03-06 16:13:35.000000000
+0100
@@ -507,6 +507,14 @@
return d->deviceIface.Disconnect();
}
+#if NM_CHECK_VERSION(1, 0, 0)
+QDBusPendingReply<> NetworkManager::Device::deleteInterface()
+{
+ Q_D(Device);
+ return d->deviceIface.Delete();
+}
+#endif
+
NetworkManager::Device::State NetworkManager::Device::state() const
{
Q_D(const Device);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.7.0/src/device.h
new/networkmanager-qt-5.8.0/src/device.h
--- old/networkmanager-qt-5.7.0/src/device.h 2015-01-23 21:43:41.000000000
+0100
+++ new/networkmanager-qt-5.8.0/src/device.h 2015-03-06 16:13:35.000000000
+0100
@@ -225,6 +225,15 @@
* activating further connections without user intervention.
*/
QDBusPendingReply<> disconnectInterface();
+#if NM_CHECK_VERSION(1, 0, 0)
+ /**
+ * Deletes a software device from NetworkManager and removes the interface
from the system.
+ * The method returns an error when called for a hardware device.
+ *
+ * @since 5.8.0
+ */
+ QDBusPendingReply<> deleteInterface();
+#endif
/**
* returns the current IPv4 address without the prefix
* \sa ipV4Config()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.7.0/src/fakenetwork/fakenetwork.cpp
new/networkmanager-qt-5.8.0/src/fakenetwork/fakenetwork.cpp
--- old/networkmanager-qt-5.7.0/src/fakenetwork/fakenetwork.cpp 2015-01-23
21:43:41.000000000 +0100
+++ new/networkmanager-qt-5.8.0/src/fakenetwork/fakenetwork.cpp 2015-03-06
16:13:35.000000000 +0100
@@ -210,7 +210,7 @@
QVariantMap map;
map.insert(QLatin1Literal("ActiveConnections"),
QVariant::fromValue<QList<QDBusObjectPath> >(m_activeConnections.keys()));
- map.insert(QLatin1Literal("ActivatingConnection"),
newActiveConnectionPath);
+ map.insert(QLatin1Literal("ActivatingConnection"),
QVariant::fromValue(QDBusObjectPath(newActiveConnectionPath)));
Q_EMIT PropertiesChanged(map);
newActiveConnection->addDevice(device);
@@ -284,9 +284,9 @@
m_activatingConnection = QDBusObjectPath("/");
m_state = 70;
QVariantMap networkMap;
- networkMap.insert(QLatin1Literal("ActivatingConnection"),
m_activatingConnection.path());
+ networkMap.insert(QLatin1Literal("ActivatingConnection"),
QVariant::fromValue(m_activatingConnection));
networkMap.insert(QLatin1Literal("Connectivity"),
NetworkManager::Connectivity::Full);
- networkMap.insert(QLatin1Literal("PrimaryConnection"),
m_primaryConnection.path());
+ networkMap.insert(QLatin1Literal("PrimaryConnection"),
QVariant::fromValue(m_primaryConnection));
networkMap.insert(QLatin1Literal("State"), m_state);
QDBusMessage message =
QDBusMessage::createSignal(QLatin1Literal("/org/kde/fakenetwork"),
QLatin1Literal("org.kde.fakenetwork"), QLatin1Literal("PropertiesChanged"));
@@ -338,7 +338,7 @@
m_state = 20;
QVariantMap networkMap;
networkMap.insert(QLatin1Literal("Connectivity"), m_connectivity);
- networkMap.insert(QLatin1Literal("PrimaryConnection"),
m_primaryConnection.path());
+ networkMap.insert(QLatin1Literal("PrimaryConnection"),
QVariant::fromValue(m_primaryConnection));
networkMap.insert(QLatin1Literal("State"), m_state);
message =
QDBusMessage::createSignal(QLatin1Literal("/org/kde/fakenetwork"),
QLatin1Literal("org.kde.fakenetwork"), QLatin1Literal("PropertiesChanged"));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.7.0/src/fakenetwork/wireddevice.h
new/networkmanager-qt-5.8.0/src/fakenetwork/wireddevice.h
--- old/networkmanager-qt-5.7.0/src/fakenetwork/wireddevice.h 2015-01-23
21:43:41.000000000 +0100
+++ new/networkmanager-qt-5.8.0/src/fakenetwork/wireddevice.h 2015-03-06
16:13:35.000000000 +0100
@@ -54,7 +54,7 @@
void setHwAddress(const QString &hwAddress);
void setPermanentHwAddress(const QString &permanentHwAddress);
void setSpeed(uint speed);
- void setState(uint state);
+ void setState(uint state) Q_DECL_OVERRIDE;
Q_SIGNALS:
Q_SCRIPTABLE void PropertiesChanged(const QVariantMap &properties);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.7.0/src/fakenetwork/wirelessdevice.h
new/networkmanager-qt-5.8.0/src/fakenetwork/wirelessdevice.h
--- old/networkmanager-qt-5.7.0/src/fakenetwork/wirelessdevice.h
2015-01-23 21:43:41.000000000 +0100
+++ new/networkmanager-qt-5.8.0/src/fakenetwork/wirelessdevice.h
2015-03-06 16:13:35.000000000 +0100
@@ -64,7 +64,7 @@
void setHwAddress(const QString &hwAddress);
void setMode(uint mode);
void setPermHwAddress(const QString &permHwAddress);
- void setState(uint state);
+ void setState(uint state) Q_DECL_OVERRIDE;
void setWirelessCapabilities(uint capabilities);
public Q_SLOTS:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.7.0/src/manager.cpp
new/networkmanager-qt-5.8.0/src/manager.cpp
--- old/networkmanager-qt-5.7.0/src/manager.cpp 2015-01-23 21:43:41.000000000
+0100
+++ new/networkmanager-qt-5.8.0/src/manager.cpp 2015-03-06 16:13:35.000000000
+0100
@@ -460,14 +460,26 @@
case NetworkManager::Debug:
logLevel = QLatin1String("DEBUG");
break;
+#if NM_CHECK_VERSION(0, 9, 10)
+ case NetworkManager::Trace:
+ logLevel = QLatin1String("TRACE");
+ break;
+#endif
}
if (!domains.testFlag(NoChange)) {
if (domains.testFlag(NetworkManager::None)) {
logDomains << QLatin1String("NONE");
}
+#if NM_CHECK_VERSION(0, 9, 10)
+ if (domains.testFlag(NetworkManager::Hardware)) {
+ logDomains << QLatin1String("PLATFORM");
+ }
+#else
if (domains.testFlag(NetworkManager::Hardware)) {
logDomains << QLatin1String("HW");
}
+#endif
+
if (domains.testFlag(NetworkManager::RFKill)) {
logDomains << QLatin1String("RFKILL");
}
@@ -552,6 +564,29 @@
if (domains.testFlag(NetworkManager::Vlan)) {
logDomains << QLatin1String("VLAN");
}
+#if NM_CHECK_VERSION(0, 9, 10)
+ if (domains.testFlag(NetworkManager::Agents)) {
+ logDomains << QLatin1String("AGENTS");
+ }
+ if (domains.testFlag(NetworkManager::Settings)) {
+ logDomains << QLatin1String("SETTINGS");
+ }
+ if (domains.testFlag(NetworkManager::DbusProps)) {
+ logDomains << QLatin1String("DBUS_PROPS");
+ }
+ if (domains.testFlag(NetworkManager::Team)) {
+ logDomains << QLatin1String("TEAM");
+ }
+ if (domains.testFlag(NetworkManager::ConCheck)) {
+ logDomains << QLatin1String("CONCHECK");
+ }
+ if (domains.testFlag(NetworkManager::Dcb)) {
+ logDomains << QLatin1String("DCB");
+ }
+ if (domains.testFlag(NetworkManager::Dispatch)) {
+ logDomains << QLatin1String("DISPATCH");
+ }
+#endif
}
iface.SetLogging(logLevel, logDomains.join(QLatin1String(",")));
}
@@ -573,14 +608,21 @@
NetworkManager::ActiveConnection::Ptr
NetworkManager::NetworkManagerPrivate::primaryConnection()
{
- return findRegisteredActiveConnection(iface.primaryConnection().path());
+ return findRegisteredActiveConnection(m_primaryConnection);
}
NetworkManager::ActiveConnection::Ptr
NetworkManager::NetworkManagerPrivate::activatingConnection()
{
- return findRegisteredActiveConnection(iface.activatingConnection().path());
+ return findRegisteredActiveConnection(m_activatingConnection);
}
+#if NM_CHECK_VERSION(1, 0, 0)
+NetworkManager::ConnectionSettings::ConnectionType
NetworkManager::NetworkManagerPrivate::primaryConnectionType()
+{
+ return m_primaryConnectionType;
+}
+#endif
+
#if NM_CHECK_VERSION(0, 9, 10)
bool NetworkManager::NetworkManagerPrivate::isStartingUp() const
{
@@ -691,9 +733,16 @@
} else if (property == QLatin1String("Connectivity")) {
connectivityChanged(it->toUInt());
} else if (property == QLatin1String("PrimaryConnection")) {
- Q_EMIT
primaryConnectionChanged(it->value<QDBusObjectPath>().path());
+ m_primaryConnection = it->value<QDBusObjectPath>().path();
+ Q_EMIT primaryConnectionChanged(m_primaryConnection);
} else if (property == QLatin1String("ActivatingConnection")) {
- Q_EMIT
activatingConnectionChanged(it->value<QDBusObjectPath>().path());
+ m_activatingConnection = it->value<QDBusObjectPath>().path();
+ Q_EMIT activatingConnectionChanged(m_activatingConnection);
+#if NM_CHECK_VERSION(1, 0, 0)
+ } else if (property == QLatin1String("PrimaryConnectionType")) {
+ m_primaryConnectionType =
NetworkManager::ConnectionSettings::typeFromString(it->toString());
+ Q_EMIT primaryConnectionTypeChanged(m_primaryConnectionType);
+#endif
#if NM_CHECK_VERSION(0, 9, 10)
} else if (property == QLatin1String("Startup")) {
Q_EMIT isStartingUpChanged();
@@ -995,6 +1044,13 @@
return globalNetworkManager->activatingConnection();
}
+#if NM_CHECK_VERSION(1, 0, 0)
+NetworkManager::ConnectionSettings::ConnectionType
NetworkManager::primaryConnectionType()
+{
+ return globalNetworkManager->primaryConnectionType();
+}
+#endif
+
#if NM_CHECK_VERSION(0, 9, 10)
bool NetworkManager::isStartingUp()
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.7.0/src/manager.h
new/networkmanager-qt-5.8.0/src/manager.h
--- old/networkmanager-qt-5.7.0/src/manager.h 2015-01-23 21:43:41.000000000
+0100
+++ new/networkmanager-qt-5.8.0/src/manager.h 2015-03-06 16:13:35.000000000
+0100
@@ -55,12 +55,25 @@
Connected /**< the system is currently connected to a network */
};
-enum LogLevel {Error, Warning, Info, Debug};
+enum LogLevel {
+ Error,
+ Warning,
+ Info,
+ Debug,
+#if NM_CHECK_VERSION(0, 9, 10)
+ Trace};
+#else
+ };
+#endif
Q_FLAGS(LogDomains)
enum LogDomain {NoChange, None, Hardware, RFKill, Ethernet, WiFi, Bluetooth,
MobileBroadBand, DHCP4, DHCP6, PPP, WiFiScan, IPv4, IPv6,
AutoIPv4, DNS, VPN, Sharing, Supplicant, UserSet, SysSet,
Suspend, Core, Devices, OLPC, Wimax, Infiniband, Firewall, Adsl, Bond, Vlan
- };
+#if NM_CHECK_VERSION(0, 9, 10)
+ , Agents, Settings, Bridge, DbusProps, Team, ConCheck, Dcb,
Dispatch };
+#else
+ };
+#endif
Q_DECLARE_FLAGS(LogDomains, LogDomain)
/**
@@ -164,6 +177,15 @@
* @since 0.9.9.0
*/
void activatingConnectionChanged(const QString &uni);
+#if NM_CHECK_VERSION(1, 0, 0)
+ /**
+ * Emitted when the primary connection type changes.
+ * @param connection type of the new primary connection
+ * @since 5.8.0
+ */
+ void
primaryConnectionTypeChanged(NetworkManager::ConnectionSettings::ConnectionType
type);
+#endif
+
#if NM_CHECK_VERSION(0, 9, 10)
/**
* Emitted when NM has started/finished its startup sequence
@@ -330,6 +352,16 @@
*/
NETWORKMANAGERQT_EXPORT ActiveConnection::Ptr activatingConnection();
+#if NM_CHECK_VERSION(1, 0, 0)
+/**
+ * @return The connection type of the "primary" active connection being
+ * used to access the network. This is the same as the Type
+ * property on the object indicated by PrimaryConnection.
+ * @since 5.8.0
+ */
+NETWORKMANAGERQT_EXPORT NetworkManager::ConnectionSettings::ConnectionType
primaryConnectionType();
+#endif
+
#if NM_CHECK_VERSION(0, 9, 10)
/**
* Indicates whether NM is still starting up; this becomes @p false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.7.0/src/manager_p.h
new/networkmanager-qt-5.8.0/src/manager_p.h
--- old/networkmanager-qt-5.7.0/src/manager_p.h 2015-01-23 21:43:41.000000000
+0100
+++ new/networkmanager-qt-5.8.0/src/manager_p.h 2015-03-06 16:13:35.000000000
+0100
@@ -59,8 +59,12 @@
bool m_isWirelessHardwareEnabled;
bool m_isWwanEnabled;
bool m_isWwanHardwareEnabled;
+ QString m_activatingConnection;
+ QString m_primaryConnection;
+#if NM_CHECK_VERSION(1, 0, 0)
+ NetworkManager::ConnectionSettings::ConnectionType m_primaryConnectionType;
+#endif
QString m_version;
-
// to store NetworkManager's version.
int m_x;
int m_y;
@@ -105,6 +109,9 @@
QDBusPendingReply<uint> checkConnectivity();
ActiveConnection::Ptr primaryConnection();
ActiveConnection::Ptr activatingConnection();
+#if NM_CHECK_VERSION(1, 0, 0)
+ NetworkManager::ConnectionSettings::ConnectionType primaryConnectionType();
+#endif
#if NM_CHECK_VERSION(0, 9, 10)
bool isStartingUp() const;
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.7.0/src/vlandevice.cpp
new/networkmanager-qt-5.8.0/src/vlandevice.cpp
--- old/networkmanager-qt-5.7.0/src/vlandevice.cpp 2015-01-23
21:43:41.000000000 +0100
+++ new/networkmanager-qt-5.8.0/src/vlandevice.cpp 2015-03-06
16:13:35.000000000 +0100
@@ -33,6 +33,9 @@
{
carrier = iface.carrier();
hwAddress = iface.hwAddress();
+#if NM_CHECK_VERSION(1, 0, 0)
+ parent = iface.parent().path();
+#endif
vlanId = iface.vlanId();
}
@@ -70,6 +73,15 @@
return d->hwAddress;
}
+#if NM_CHECK_VERSION(1, 0, 0)
+NetworkManager::Device::Ptr NetworkManager::VlanDevice::parent() const
+{
+ Q_D(const VlanDevice);
+
+ return NetworkManager::findNetworkInterface(d->parent);
+}
+#endif
+
uint NetworkManager::VlanDevice::vlanId() const
{
Q_D(const VlanDevice);
@@ -87,6 +99,11 @@
} else if (property == QLatin1String("HwAddress")) {
hwAddress = value.toString();
Q_EMIT q->hwAddressChanged(hwAddress);
+#if NM_CHECK_VERSION(1, 0, 0)
+ } else if (property == QLatin1String("Parent")) {
+ parent = value.value<QDBusObjectPath>().path();
+ Q_EMIT q->parentChanged(parent);
+#endif
} else if (property == QLatin1String("VlanId")) {
vlanId = value.toUInt();
Q_EMIT q->vlanIdChanged(vlanId);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.7.0/src/vlandevice.h
new/networkmanager-qt-5.8.0/src/vlandevice.h
--- old/networkmanager-qt-5.7.0/src/vlandevice.h 2015-01-23
21:43:41.000000000 +0100
+++ new/networkmanager-qt-5.8.0/src/vlandevice.h 2015-03-06
16:13:35.000000000 +0100
@@ -56,6 +56,13 @@
* Hardware address of the device
*/
QString hwAddress() const;
+#if NM_CHECK_VERSION(1, 0, 0)
+ /**
+ * The parent device of this VLAN device
+ * @since 5.8.0
+ */
+ NetworkManager::Device::Ptr parent() const;
+#endif
/**
* The VLAN ID of this VLAN interface
*/
@@ -70,6 +77,12 @@
* Emmited when the hardware address of this device has changed
*/
void hwAddressChanged(const QString &address);
+#if NM_CHECK_VERSION(1, 0, 0)
+ /**
+ * Emmited when the parent device of this device has changed
+ */
+ void parentChanged(const QString &path);
+#endif
/**
* Emmited when the VLAN ID of this device has changed
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.7.0/src/vlandevice_p.h
new/networkmanager-qt-5.8.0/src/vlandevice_p.h
--- old/networkmanager-qt-5.7.0/src/vlandevice_p.h 2015-01-23
21:43:41.000000000 +0100
+++ new/networkmanager-qt-5.8.0/src/vlandevice_p.h 2015-03-06
16:13:35.000000000 +0100
@@ -39,6 +39,9 @@
OrgFreedesktopNetworkManagerDeviceVlanInterface iface;
bool carrier;
QString hwAddress;
+#if NM_CHECK_VERSION(1, 0, 0)
+ QString parent;
+#endif
uint vlanId;
Q_DECLARE_PUBLIC(VlanDevice)
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
