[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:28:22 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=563233c
The following commit has been merged in the master branch:
commit 563233cac78012fbd657e4ebdeef741b81a4008f
Author: Albert Vaca <albertvaka at gmail.com>
Date: Sun Mar 15 19:13:54 2015 -0700
Fixed unpair still using the old KConfig
---
core/device.cpp | 17 ++++++++---------
core/device.h | 1 +
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/core/device.cpp b/core/device.cpp
index 85d4134..0c41ee1 100644
--- a/core/device.cpp
+++ b/core/device.cpp
@@ -212,18 +212,20 @@ void Device::requestPair()
void Device::unpair()
{
- m_pairStatus = Device::NotPaired;
-
- KdeConnectConfig::instance()->removeTrustedDevice(id());
NetworkPackage np(PACKAGE_TYPE_PAIR);
np.set("pair", false);
sendPackage(np);
- reloadPlugins(); //Will unload the plugins
+ unpairInternal();
+}
+void Device::unpairInternal()
+{
+ m_pairStatus = Device::NotPaired;
+ KdeConnectConfig::instance()->removeTrustedDevice(id());
+ reloadPlugins(); //Will unload the plugins
Q_EMIT unpaired();
-
}
void Device::pairingTimeout()
@@ -377,10 +379,7 @@ void Device::privateReceivedPackage(const NetworkPackage& np)
m_pairingTimeut.stop();
Q_EMIT pairingFailed(i18n("Canceled by other peer"));
} else if (prevPairStatus == Device::Paired) {
- KSharedConfigPtr config = KSharedConfig::openConfig("kdeconnectrc");
- config->group("trusted_devices").deleteGroup(id());
- reloadPlugins();
- Q_EMIT unpaired();
+ unpairInternal();
}
}
diff --git a/core/device.h b/core/device.h
index a0c9729..c2d743a 100644
--- a/core/device.h
+++ b/core/device.h
@@ -125,6 +125,7 @@ Q_SIGNALS:
private:
void setName(const QString &name);
+ void unpairInternal();
const QString m_deviceId;
QString m_deviceName;
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list