Hello community,
here is the log from the commit of package libKF5NetworkManagerQt for
openSUSE:Factory checked in at 2016-02-24 18:57:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2016-01-20 09:49:08.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new/libKF5NetworkManagerQt.changes
2016-02-24 18:57:50.000000000 +0100
@@ -1,0 +2,9 @@
+Sat Feb 6 18:08:53 UTC 2016 - [email protected]
+
+- Update to 5.19.0 (boo#967668)
+ * Re-check connection state and other properties to be sure
+ they are actual (version 2) (kde#352326)
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.19.0.php
+
+-------------------------------------------------------------------
Old:
----
networkmanager-qt-5.18.0.tar.xz
New:
----
networkmanager-qt-5.19.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libKF5NetworkManagerQt.spec ++++++
--- /var/tmp/diff_new_pack.p6hL9P/_old 2016-02-24 18:57:51.000000000 +0100
+++ /var/tmp/diff_new_pack.p6hL9P/_new 2016-02-24 18:57:51.000000000 +0100
@@ -17,9 +17,9 @@
%define soversion 6
-%define _tar_path 5.18
+%define _tar_path 5.19
Name: libKF5NetworkManagerQt
-Version: 5.18.0
+Version: 5.19.0
Release: 0
Summary: A Qt wrapper for NetworkManager DBus API
License: LGPL-2.1 or LGPL-3.0
++++++ networkmanager-qt-5.18.0.tar.xz -> networkmanager-qt-5.19.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.18.0/CMakeLists.txt
new/networkmanager-qt-5.19.0/CMakeLists.txt
--- old/networkmanager-qt-5.18.0/CMakeLists.txt 2016-01-01 21:08:45.000000000
+0100
+++ new/networkmanager-qt-5.19.0/CMakeLists.txt 2016-02-06 10:46:32.000000000
+0100
@@ -3,7 +3,7 @@
project(NetworkManagerQt)
include(FeatureSummary)
-find_package(ECM 5.18.0 NO_MODULE)
+find_package(ECM 5.19.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)
@@ -13,7 +13,7 @@
find_package(NetworkManager 0.9.8.4 REQUIRED)
include(KDEInstallDirs)
-include(KDEFrameworkCompilerSettings)
+include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
set(REQUIRED_QT_VERSION 5.3.0)
@@ -32,7 +32,7 @@
include(ECMSetupVersion)
include(ECMGenerateHeaders)
-set(KF5_VERSION "5.18.0") # handled by release scripts
+set(KF5_VERSION "5.19.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.18.0/src/activeconnection.cpp
new/networkmanager-qt-5.19.0/src/activeconnection.cpp
--- old/networkmanager-qt-5.18.0/src/activeconnection.cpp 2016-01-01
21:08:45.000000000 +0100
+++ new/networkmanager-qt-5.19.0/src/activeconnection.cpp 2016-02-06
10:46:32.000000000 +0100
@@ -108,36 +108,7 @@
* Workaround: Re-check connection state before we watch changes in case
it gets changed too quickly
* BUG:352326
*/
- if (d->state !=
NetworkManager::ActiveConnectionPrivate::convertActiveConnectionState(d->iface.state()))
{
- d->state =
NetworkManager::ActiveConnectionPrivate::convertActiveConnectionState(d->iface.state());
- Q_EMIT stateChanged(d->state);
- }
-
-#if NM_CHECK_VERSION(0, 9, 10)
- QDBusObjectPath ip4ConfigObjectPath = d->iface.ip4Config();
- if (!ip4ConfigObjectPath.path().isNull() && ip4ConfigObjectPath.path() !=
d->ipV4ConfigPath) {
- d->ipV4ConfigPath = ip4ConfigObjectPath.path();
- Q_EMIT ipV4ConfigChanged();
- }
-
- QDBusObjectPath ip6ConfigObjectPath = d->iface.ip6Config();
- if (!ip6ConfigObjectPath.path().isNull() && ip6ConfigObjectPath.path() !=
d->ipV6ConfigPath) {
- d->ipV6ConfigPath = ip6ConfigObjectPath.path();
- Q_EMIT ipV6ConfigChanged();
- }
-
- QDBusObjectPath dhcp4ConfigObjectPath = d->iface.dhcp4Config();
- if (!dhcp4ConfigObjectPath.path().isNull() && dhcp4ConfigObjectPath.path()
!= d->dhcp4ConfigPath) {
- d->dhcp4ConfigPath = dhcp4ConfigObjectPath.path();
- Q_EMIT dhcp4ConfigChanged();
- }
-
- QDBusObjectPath dhcp6ConfigObjectPath = d->iface.dhcp6Config();
- if (!dhcp6ConfigObjectPath.path().isNull() && dhcp6ConfigObjectPath.path()
!= d->dhcp6ConfigPath) {
- d->dhcp6ConfigPath = dhcp6ConfigObjectPath.path();
- Q_EMIT dhcp6ConfigChanged();
- }
-#endif
+ d->recheckProperties();
}
NetworkManager::ActiveConnection::ActiveConnection(ActiveConnectionPrivate
&dd, QObject *parent)
@@ -151,36 +122,7 @@
* Workaround: Re-check connection state before we watch changes in case
it gets changed too quickly
* BUG:352326
*/
- if (d->state !=
NetworkManager::ActiveConnectionPrivate::convertActiveConnectionState(d->iface.state()))
{
- d->state =
NetworkManager::ActiveConnectionPrivate::convertActiveConnectionState(d->iface.state());
- Q_EMIT stateChanged(d->state);
- }
-
-#if NM_CHECK_VERSION(0, 9, 10)
- QDBusObjectPath ip4ConfigObjectPath = d->iface.ip4Config();
- if (!ip4ConfigObjectPath.path().isNull() && ip4ConfigObjectPath.path() !=
d->ipV4ConfigPath) {
- d->ipV4ConfigPath = ip4ConfigObjectPath.path();
- Q_EMIT ipV4ConfigChanged();
- }
-
- QDBusObjectPath ip6ConfigObjectPath = d->iface.ip6Config();
- if (!ip6ConfigObjectPath.path().isNull() && ip6ConfigObjectPath.path() !=
d->ipV6ConfigPath) {
- d->ipV6ConfigPath = ip6ConfigObjectPath.path();
- Q_EMIT ipV6ConfigChanged();
- }
-
- QDBusObjectPath dhcp4ConfigObjectPath = d->iface.dhcp4Config();
- if (!dhcp4ConfigObjectPath.path().isNull() && dhcp4ConfigObjectPath.path()
!= d->dhcp4ConfigPath) {
- d->dhcp4ConfigPath = dhcp4ConfigObjectPath.path();
- Q_EMIT dhcp4ConfigChanged();
- }
-
- QDBusObjectPath dhcp6ConfigObjectPath = d->iface.dhcp6Config();
- if (!dhcp6ConfigObjectPath.path().isNull() && dhcp6ConfigObjectPath.path()
!= d->dhcp6ConfigPath) {
- d->dhcp6ConfigPath = dhcp6ConfigObjectPath.path();
- Q_EMIT dhcp6ConfigChanged();
- }
-#endif
+ d->recheckProperties();
}
NetworkManager::ActiveConnection::~ActiveConnection()
@@ -304,6 +246,77 @@
return d->devices;
}
+void NetworkManager::ActiveConnectionPrivate::recheckProperties()
+{
+ Q_Q(ActiveConnection);
+
+ /*
+ * Workaround: Re-check connection state before we watch changes in case
it gets changed too quickly
+ * BUG:352326
+ */
+ QStringList properties;
+ const QDBusObjectPath ip4ConfigObjectPath = iface.ip4Config();
+ const QDBusObjectPath ip6ConfigObjectPath = iface.ip6Config();
+ const QDBusObjectPath dhcp4ConfigObjectPath = iface.dhcp4Config();
+ const QDBusObjectPath dhcp6ConfigObjectPath = iface.dhcp6Config();
+
+ if (state !=
NetworkManager::ActiveConnectionPrivate::convertActiveConnectionState(iface.state()))
{
+ properties << QLatin1String("State");
+ }
+
+#if NM_CHECK_VERSION(0, 9, 10)
+ if (!ip4ConfigObjectPath.path().isNull() && ip4ConfigObjectPath.path() !=
ipV4ConfigPath) {
+ properties << QLatin1String("Ip4Config");
+ }
+
+ if (!ip6ConfigObjectPath.path().isNull() && ip6ConfigObjectPath.path() !=
ipV6ConfigPath) {
+ properties << QLatin1String("Ip6Config");
+ }
+
+ if (!dhcp4ConfigObjectPath.path().isNull() && dhcp4ConfigObjectPath.path()
!= dhcp4ConfigPath) {
+ properties << QLatin1String("Dhcp4Config");
+ }
+
+ if (!dhcp6ConfigObjectPath.path().isNull() && dhcp6ConfigObjectPath.path()
!= dhcp6ConfigPath) {
+ properties << QLatin1String("Dhcp6Config");
+ }
+#endif
+
+ Q_FOREACH (const QString &property, properties) {
+ QDBusMessage message =
QDBusMessage::createMethodCall(NetworkManager::NetworkManagerPrivate::DBUS_SERVICE,
+
NetworkManager::NetworkManagerPrivate::DBUS_DAEMON_PATH,
+
NetworkManager::NetworkManagerPrivate::FDO_DBUS_PROPERTIES,
+ QLatin1String("Get"));
+ message << iface.staticInterfaceName() << property;
+
+ QDBusPendingCall pendingCall =
QDBusConnection::systemBus().asyncCall(message);
+ QDBusPendingCallWatcher *watcher = new
QDBusPendingCallWatcher(pendingCall, this);
+
+ connect(watcher, &QDBusPendingCallWatcher::finished, [watcher, q,
this, property] () {
+ watcher->deleteLater();
+ if (property == QLatin1String("State")) {
+ state =
NetworkManager::ActiveConnectionPrivate::convertActiveConnectionState(iface.state());
+ Q_EMIT q->stateChanged(state);
+ }
+#if NM_CHECK_VERSION(0, 9, 10)
+ if (property == QLatin1String("Ip4Config")) {
+ ipV4ConfigPath = iface.ip4Config().path();
+ Q_EMIT q->ipV4ConfigChanged();
+ } else if (property == QLatin1String("Ip6Config")) {
+ ipV6ConfigPath = iface.ip6Config().path();
+ Q_EMIT q->ipV6ConfigChanged();
+ } else if (property == QLatin1String("Dhcp4Config")) {
+ dhcp4ConfigPath = iface.dhcp4Config().path();
+ Q_EMIT q->dhcp4ConfigChanged();
+ } else if (property == QLatin1String("Dhcp6Config")) {
+ dhcp6ConfigPath = iface.dhcp6Config().path();
+ Q_EMIT q->dhcp6ConfigChanged();
+ }
+#endif
+ });
+ }
+}
+
void NetworkManager::ActiveConnectionPrivate::propertiesChanged(const
QVariantMap &properties)
{
Q_Q(ActiveConnection);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.18.0/src/activeconnection_p.h
new/networkmanager-qt-5.19.0/src/activeconnection_p.h
--- old/networkmanager-qt-5.18.0/src/activeconnection_p.h 2016-01-01
21:08:45.000000000 +0100
+++ new/networkmanager-qt-5.19.0/src/activeconnection_p.h 2016-02-06
10:46:32.000000000 +0100
@@ -60,6 +60,12 @@
Q_DECLARE_PUBLIC(ActiveConnection)
ActiveConnection *q_ptr;
+
+ /*
+ * Workaround: Re-check connection state before we watch changes in case
it gets changed too quickly
+ * BUG:352326
+ */
+ void recheckProperties();
private Q_SLOTS:
void propertiesChanged(const QVariantMap &properties);
};
