[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=2aca5ca

The following commit has been merged in the master branch:
commit 2aca5ca11eb030d31c98fea497a65a8382910387
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Thu Dec 17 09:24:34 2015 -0800

    Added error message when trying to pair older devices
---
 core/backends/lan/landevicelink.cpp   | 8 +++++++-
 core/backends/lan/lanlinkprovider.cpp | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/backends/lan/landevicelink.cpp b/core/backends/lan/landevicelink.cpp
index d8fe147..4fdb5b3 100644
--- a/core/backends/lan/landevicelink.cpp
+++ b/core/backends/lan/landevicelink.cpp
@@ -18,6 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <KLocalizedString>
+
 #include "landevicelink.h"
 #include "core_debug.h"
 #include <kdeconnectconfig.h>
@@ -124,7 +126,11 @@ void LanDeviceLink::dataReceived()
 
 void LanDeviceLink::userRequestsPair()
 {
-    qobject_cast<LanLinkProvider*>(provider())->userRequestsPair(deviceId());
+    if (mSocketLineReader->peerCertificate().isNull()) {
+        Q_EMIT pairingError(i18n("This device can't be paired because is running an old version of KDE Connect."));
+    } else {
+        qobject_cast<LanLinkProvider*>(provider())->userRequestsPair(deviceId());
+    }
 }
 
 void LanDeviceLink::userRequestsUnpair()
diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
index f58c1cd..561fb7d 100644
--- a/core/backends/lan/lanlinkprovider.cpp
+++ b/core/backends/lan/lanlinkprovider.cpp
@@ -288,7 +288,7 @@ void LanLinkProvider::sslErrors(const QList<QSslError>& errors)
             case QSslError::CertificateUntrusted:
             case QSslError::SelfSignedCertificate: {
                 qCDebug(KDECONNECT_CORE) << "Unpairing device due to " << error.errorString();
-                /* Due to simultaneous multiple connections, it may be possible that device instance does not exist */
+                // Due to simultaneous multiple connections, it may be possible that device instance does not exist anymore
                 Device *device = Daemon::instance()->getDevice(socket->peerVerifyName());
                 if (device != Q_NULLPTR) {
                     device->unpair();

-- 
kdeconnect packaging