[SCM] plasma-nm packaging branch, kubuntu_unstable, updated. ubuntu/4%5.4.2-0ubuntu1.1-12-g3f19cfe
Harald Sitter
apachelogger-guest at moszumanska.debian.org
Fri Oct 30 11:44:53 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-nm.git;a=commitdiff;h=3f19cfe
The following commit has been merged in the kubuntu_unstable branch:
commit 3f19cfe60fbbfcaa81d2bb2870ed775cd0a4c54c
Author: Harald Sitter <sitter at kde.org>
Date: Fri Oct 30 12:44:42 2015 +0100
ditch upstreamed patch for CI
---
debian/patches/series | 1 -
.../upstream_fix_making_bluez_asynchronous.diff | 217 ---------------------
2 files changed, 218 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 4105b55..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-upstream_fix_making_bluez_asynchronous.diff
diff --git a/debian/patches/upstream_fix_making_bluez_asynchronous.diff b/debian/patches/upstream_fix_making_bluez_asynchronous.diff
deleted file mode 100644
index 13ba4d6..0000000
--- a/debian/patches/upstream_fix_making_bluez_asynchronous.diff
+++ /dev/null
@@ -1,217 +0,0 @@
-From: Jan Grulich <jgrulich at redhat.com>
-Date: Sun, 25 Oct 2015 16:36:44 +0000
-Subject: Make all bluez calls asynchronous
-X-Git-Url: http://quickgit.kde.org/?p=plasma-nm.git&a=commitdiff&h=48a45ebad0e1d5ecc023a9e8866a95d47c76790f
----
-Make all bluez calls asynchronous
-
-REVIEW:125785
-BUG:354230
----
-
-
---- a/libs/handler.cpp
-+++ b/libs/handler.cpp
-@@ -42,6 +42,7 @@
- #endif
-
- #include <QDBusError>
-+#include <QDBusPendingReply>
- #include <QIcon>
-
- #include <KNotification>
-@@ -54,9 +55,8 @@
- #include <KIconLoader>
- #include <KWallet/Wallet>
-
--Handler::Handler(QObject* parent)
-+Handler::Handler(QObject *parent)
- : QObject(parent)
-- , m_tmpBluetoothEnabled(isBtEnabled())
- #if !NM_CHECK_VERSION(1, 2, 0)
- , m_tmpWimaxEnabled(NetworkManager::isWimaxEnabled())
- #endif
-@@ -281,22 +281,19 @@
- void Handler::enableAirplaneMode(bool enable)
- {
- if (enable) {
-- m_tmpBluetoothEnabled = isBtEnabled();
- #if !NM_CHECK_VERSION(1, 2, 0)
- m_tmpWimaxEnabled = NetworkManager::isWimaxEnabled();
- #endif
- m_tmpWirelessEnabled = NetworkManager::isWirelessEnabled();
- m_tmpWwanEnabled = NetworkManager::isWwanEnabled();
-- enableBt(false);
-+ enableBluetooth(false);
- #if !NM_CHECK_VERSION(1, 2, 0)
- enableWimax(false);
- #endif
- enableWireless(false);
- enableWwan(false);
- } else {
-- if (m_tmpBluetoothEnabled) {
-- enableBt(true);
-- }
-+ enableBluetooth(true);
- #if !NM_CHECK_VERSION(1, 2, 0)
- if (m_tmpWimaxEnabled) {
- enableWimax(true);
-@@ -311,6 +308,64 @@
- }
- }
-
-+void Handler::enableBluetooth(bool enable)
-+{
-+ qDBusRegisterMetaType< QMap<QDBusObjectPath, NMVariantMapMap > >();
-+
-+ QDBusMessage message = QDBusMessage::createMethodCall("org.bluez", "/", "org.freedesktop.DBus.ObjectManager", "GetManagedObjects");
-+ QDBusPendingReply<QMap<QDBusObjectPath, NMVariantMapMap> > reply = QDBusConnection::systemBus().asyncCall(message);
-+ QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, this);
-+ connect(watcher, &QDBusPendingCallWatcher::finished,
-+ [this, enable] (QDBusPendingCallWatcher *watcher) {
-+ QDBusPendingReply<QMap<QDBusObjectPath, NMVariantMapMap> > reply = *watcher;
-+ if (reply.isValid()) {
-+ Q_FOREACH (const QDBusObjectPath &path, reply.value().keys()) {
-+ const QString objPath = path.path();
-+ qCDebug(PLASMA_NM) << "inspecting path" << objPath;
-+ const QStringList interfaces = reply.value().value(path).keys();
-+ qCDebug(PLASMA_NM) << "interfaces:" << interfaces;
-+ if (interfaces.contains("org.bluez.Adapter1")) {
-+ // We need to check previous state first
-+ if (!enable) {
-+ QDBusMessage message = QDBusMessage::createMethodCall("org.bluez", objPath, "org.freedesktop.DBus.Properties", "Get");
-+ QList<QVariant> arguments;
-+ arguments << QLatin1Literal("org.bluez.Adapter1");
-+ arguments << QLatin1Literal("Powered");
-+ message.setArguments(arguments);
-+ QDBusPendingReply<QVariant> getReply = QDBusConnection::systemBus().asyncCall(message);
-+ QDBusPendingCallWatcher *getWatcher = new QDBusPendingCallWatcher(getReply, this);
-+ connect(getWatcher, &QDBusPendingCallWatcher::finished,
-+ [this, objPath] (QDBusPendingCallWatcher *watcher) {
-+ QDBusPendingReply<QVariant> reply = *watcher;
-+ if (reply.isValid()) {
-+ m_bluetoothAdapters.insert(objPath, reply.value().toBool());
-+ QDBusMessage message = QDBusMessage::createMethodCall("org.bluez", objPath, "org.freedesktop.DBus.Properties", "Set");
-+ QList<QVariant> arguments;
-+ arguments << QLatin1Literal("org.bluez.Adapter1");
-+ arguments << QLatin1Literal("Powered");
-+ arguments << QVariant::fromValue(QDBusVariant(QVariant(false)));
-+ message.setArguments(arguments);
-+ QDBusConnection::systemBus().asyncCall(message);
-+ }
-+
-+ });
-+ getWatcher->deleteLater();
-+ } else if (enable && m_bluetoothAdapters.value(objPath)) {
-+ QDBusMessage message = QDBusMessage::createMethodCall("org.bluez", objPath, "org.freedesktop.DBus.Properties", "Set");
-+ QList<QVariant> arguments;
-+ arguments << QLatin1Literal("org.bluez.Adapter1");
-+ arguments << QLatin1Literal("Powered");
-+ arguments << QVariant::fromValue(QDBusVariant(QVariant(enable)));
-+ message.setArguments(arguments);
-+ QDBusConnection::systemBus().asyncCall(message);
-+ }
-+ }
-+ }
-+ }
-+ });
-+ watcher->deleteLater();
-+}
-+
- void Handler::enableNetworking(bool enable)
- {
- NetworkManager::setNetworkingEnabled(enable);
-@@ -331,54 +386,6 @@
- void Handler::enableWwan(bool enable)
- {
- NetworkManager::setWwanEnabled(enable);
--}
--
--bool Handler::isBtEnabled()
--{
-- qDBusRegisterMetaType< QMap<QDBusObjectPath, NMVariantMapMap > >();
-- bool result = false;
--
-- QDBusInterface managerIface("org.bluez", "/", "org.freedesktop.DBus.ObjectManager", QDBusConnection::systemBus(), this);
-- QDBusReply<QMap<QDBusObjectPath, NMVariantMapMap> > reply = managerIface.call("GetManagedObjects");
-- if (reply.isValid()) {
-- Q_FOREACH (const QDBusObjectPath &path, reply.value().keys()) {
-- const QString objPath = path.path();
-- qCDebug(PLASMA_NM) << "inspecting path" << objPath;
-- const QStringList interfaces = reply.value().value(path).keys();
-- qCDebug(PLASMA_NM) << "interfaces:" << interfaces;
-- if (interfaces.contains("org.bluez.Adapter1")) {
-- QDBusInterface adapterIface("org.bluez", objPath, "org.bluez.Adapter1", QDBusConnection::systemBus(), this);
-- const bool adapterEnabled = adapterIface.property("Powered").toBool();
-- qCDebug(PLASMA_NM) << "Adapter" << objPath << "enabled:" << adapterEnabled;
-- result |= adapterEnabled;
-- }
-- }
-- } else {
-- qCDebug(PLASMA_NM) << "Failed to enumerate BT adapters";
-- }
--
-- return result;
--}
--
--void Handler::enableBt(bool enable)
--{
-- QDBusInterface managerIface("org.bluez", "/", "org.freedesktop.DBus.ObjectManager", QDBusConnection::systemBus(), this);
-- QDBusReply<QMap<QDBusObjectPath, NMVariantMapMap> > reply = managerIface.call("GetManagedObjects");
-- if (reply.isValid()) {
-- Q_FOREACH (const QDBusObjectPath &path, reply.value().keys()) {
-- const QString objPath = path.path();
-- qCDebug(PLASMA_NM) << "inspecting path" << objPath;
-- const QStringList interfaces = reply.value().value(path).keys();
-- qCDebug(PLASMA_NM) << "interfaces:" << interfaces;
-- if (interfaces.contains("org.bluez.Adapter1")) {
-- QDBusInterface adapterIface("org.bluez", objPath, "org.bluez.Adapter1", QDBusConnection::systemBus(), this);
-- qCDebug(PLASMA_NM) << "Enabling adapter:" << objPath << enable;
-- adapterIface.setProperty("Powered", enable);
-- }
-- }
-- } else {
-- qCDebug(PLASMA_NM) << "Failed to enumerate BT adapters";
-- }
- }
-
- // void Handler::editConnection(const QString& uuid)
-
---- a/libs/handler.h
-+++ b/libs/handler.h
-@@ -84,7 +84,6 @@
- */
- void disconnectAll();
- void enableAirplaneMode(bool enable);
-- void enableBt(bool enable);
- void enableNetworking(bool enable);
- void enableWireless(bool enable);
- #if !NM_CHECK_VERSION(1, 2, 0)
-@@ -113,13 +112,12 @@
-
- private Q_SLOTS:
- void initKdedModule();
-- void replyFinished(QDBusPendingCallWatcher * watcher);
-+ void replyFinished(QDBusPendingCallWatcher *watcher);
- #if WITH_MODEMMANAGER_SUPPORT
- void unlockRequiredChanged(MMModemLock modemLock);
- #endif
-
- private:
-- bool m_tmpBluetoothEnabled;
- #if !NM_CHECK_VERSION(1, 2, 0)
- bool m_tmpWimaxEnabled;
- #endif
-@@ -131,8 +129,9 @@
- QString m_tmpConnectionUuid;
- QString m_tmpDevicePath;
- QString m_tmpSpecificPath;
-+ QMap<QString, bool> m_bluetoothAdapters;
-
-- bool isBtEnabled();
-+ void enableBluetooth(bool enable);
- QDBusInterface m_agentIface;
- };
-
-
-
--
plasma-nm packaging
More information about the pkg-kde-commits
mailing list