[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:27:29 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=f314420
The following commit has been merged in the master branch:
commit f314420d4f50cbb23ac9b97bbad9d76c36049610
Author: Àlex Fiestas <afiestas at kde.org>
Date: Tue Mar 4 02:33:41 2014 +0100
Coding style (adding brackets)
---
kded/device.cpp | 5 ++++-
kded/networkpackage.cpp | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/kded/device.cpp b/kded/device.cpp
index 0d43e5d..3b4b09f 100644
--- a/kded/device.cpp
+++ b/kded/device.cpp
@@ -160,7 +160,10 @@ void Device::requestPair()
return;
}
- if (m_pairStatus == Device::Paired) return;
+ if (m_pairStatus == Device::Paired) {
+ return;
+ }
+
pairingTimer.setSingleShot(true);
pairingTimer.start(30 * 1000);
connect(&pairingTimer, SIGNAL(timeout()),
diff --git a/kded/networkpackage.cpp b/kded/networkpackage.cpp
index fa85008..72c54e5 100644
--- a/kded/networkpackage.cpp
+++ b/kded/networkpackage.cpp
@@ -163,7 +163,9 @@ bool NetworkPackage::decrypt(QCA::PrivateKey& key, NetworkPackage* out) const
bool success = unserialize(decryptedJson, out);
- if (!success) return false;
+ if (!success) {
+ return false;
+ }
if (hasPayload()) {
out->mPayload = mPayload;
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list