forked from pool/kdeconnect-kde
Dominique Leuenberger
23045b7cc4
- Update to 1.3.4 * Always play when call ended (kde#400787) * [cli] Show all reachable devices (kde#402088) * [sftp] Get device ID from URL * Retry the network packet if it failed to unserialize * Fix sending keys via CLI * [kio] Fix file browsing with non-KIO file managers - Run spec-cleaner - Refresh 0001-Fix-build-on-Leap-42.3.patch - Add 0001-Revert-Retry-the-network-packet-if-it-failed-to-unse.patch to make it build on Leap 42.3 - Drop Provides/Obsoletes for kdeconnect-kde-devel, that package doesn't exist anymore since 2015 and nothing should need it OBS-URL: https://build.opensuse.org/request/show/690439 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdeconnect-kde?expand=0&rev=14
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
From 902474c5d99403194ca613fb853483e81356c658 Mon Sep 17 00:00:00 2001
|
|
From: Wolfgang Bauer <wbauer@tmo.at>
|
|
Date: Mon, 25 Mar 2019 21:34:00 +0100
|
|
Subject: [PATCH] Revert "Retry the network packet if it failed to unserialize"
|
|
|
|
It requires at least Qt 5.7.0, but Leap 42.3 only has 5.6.2.
|
|
|
|
This reverts commit a2c6f0a8064f4426129018daa15cb82c6d33b69c.
|
|
---
|
|
core/backends/lan/lanlinkprovider.cpp | 3 ---
|
|
1 file changed, 3 deletions(-)
|
|
|
|
diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
|
|
index 77a50d3d..a6dda376 100644
|
|
--- a/core/backends/lan/lanlinkprovider.cpp
|
|
+++ b/core/backends/lan/lanlinkprovider.cpp
|
|
@@ -350,7 +350,6 @@ void LanLinkProvider::newConnection()
|
|
void LanLinkProvider::dataReceived()
|
|
{
|
|
QSslSocket* socket = qobject_cast<QSslSocket*>(sender());
|
|
- socket->startTransaction();
|
|
|
|
const QByteArray data = socket->readLine();
|
|
|
|
@@ -361,10 +360,8 @@ void LanLinkProvider::dataReceived()
|
|
|
|
if (!success) {
|
|
delete np;
|
|
- socket->rollbackTransaction();
|
|
return;
|
|
}
|
|
- socket->commitTransaction();
|
|
|
|
if (np->type() != PACKET_TYPE_IDENTITY) {
|
|
qCWarning(KDECONNECT_CORE) << "LanLinkProvider/newConnection: Expected identity, received " << np->type();
|
|
--
|
|
2.16.4
|
|
|