[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:28:40 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=77256e1
The following commit has been merged in the master branch:
commit 77256e1932e13775cdfea92b9cf19cdf3d68c6df
Author: Albert Vaca <albertvaka at gmail.com>
Date: Sun Jun 21 19:40:05 2015 -0700
Devices where not removed if they were unpaired after going offline
---
core/daemon.cpp | 9 +++++----
core/daemon.h | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/core/daemon.cpp b/core/daemon.cpp
index 79bdf6b..af4c67b 100644
--- a/core/daemon.cpp
+++ b/core/daemon.cpp
@@ -69,8 +69,8 @@ Daemon::Daemon(QObject *parent)
const QStringList& list = KdeConnectConfig::instance()->trustedDevices();
Q_FOREACH(const QString& id, list) {
Device* device = new Device(this, id);
- connect(device, SIGNAL(reachableStatusChanged()),
- this, SLOT(onDeviceReachableStatusChanged()));
+ connect(device, SIGNAL(reachableStatusChanged()), this, SLOT(onDeviceStatusChanged()));
+ connect(device, SIGNAL(pairingChanged(bool)), this, SLOT(onDeviceStatusChanged()));
d->mDevices[id] = device;
Q_EMIT deviceAdded(id);
}
@@ -136,14 +136,15 @@ void Daemon::onNewDeviceLink(const NetworkPackage& identityPackage, DeviceLink*
//qCDebug(KDECONNECT_CORE) << "It is a new device";
Device* device = new Device(this, identityPackage, dl);
- connect(device, SIGNAL(reachableStatusChanged()), this, SLOT(onDeviceReachableStatusChanged()));
+ connect(device, SIGNAL(reachableStatusChanged()), this, SLOT(onDeviceStatusChanged()));
+ connect(device, SIGNAL(pairingChanged(bool)), this, SLOT(onDeviceStatusChanged()));
d->mDevices[id] = device;
Q_EMIT deviceAdded(id);
}
}
-void Daemon::onDeviceReachableStatusChanged()
+void Daemon::onDeviceStatusChanged()
{
Device* device = (Device*)sender();
QString id = device->id();
diff --git a/core/daemon.h b/core/daemon.h
index c073384..674ca01 100644
--- a/core/daemon.h
+++ b/core/daemon.h
@@ -72,7 +72,7 @@ Q_SIGNALS:
private Q_SLOTS:
void onNewDeviceLink(const NetworkPackage& identityPackage, DeviceLink* dl);
- void onDeviceReachableStatusChanged();
+ void onDeviceStatusChanged();
private:
QScopedPointer<struct DaemonPrivate> d;
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list