[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=6cde027

The following commit has been merged in the master branch:
commit 6cde0271fbcbedd475596baf7f0af9de4814fca4
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Fri Feb 12 07:59:12 2016 -0800

    Removed loopbackpairinghandler
---
 core/backends/loopback/CMakeLists.txt             |  1 -
 core/backends/loopback/loopbackdevicelink.cpp     |  1 -
 core/backends/loopback/loopbackpairinghandler.cpp | 70 -----------------------
 core/backends/loopback/loopbackpairinghandler.h   | 43 --------------
 4 files changed, 115 deletions(-)

diff --git a/core/backends/loopback/CMakeLists.txt b/core/backends/loopback/CMakeLists.txt
index dd9f59a..9194c9c 100644
--- a/core/backends/loopback/CMakeLists.txt
+++ b/core/backends/loopback/CMakeLists.txt
@@ -4,7 +4,6 @@ set(backends_kdeconnect_SRCS
 
     backends/loopback/loopbacklinkprovider.cpp
     backends/loopback/loopbackdevicelink.cpp
-#     backends/loopback/loopbackpairinghandler.cpp
 
     PARENT_SCOPE
 )
diff --git a/core/backends/loopback/loopbackdevicelink.cpp b/core/backends/loopback/loopbackdevicelink.cpp
index ae4e8af..71c95f2 100644
--- a/core/backends/loopback/loopbackdevicelink.cpp
+++ b/core/backends/loopback/loopbackdevicelink.cpp
@@ -21,7 +21,6 @@
 #include "loopbackdevicelink.h"
 
 #include "loopbacklinkprovider.h"
-#include "loopbackpairinghandler.h"
 
 LoopbackDeviceLink::LoopbackDeviceLink(const QString& deviceId, LoopbackLinkProvider* provider)
     : DeviceLink(deviceId, provider)
diff --git a/core/backends/loopback/loopbackpairinghandler.cpp b/core/backends/loopback/loopbackpairinghandler.cpp
deleted file mode 100644
index f5c8513..0000000
--- a/core/backends/loopback/loopbackpairinghandler.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Copyright 2015 Vineet Garg <grg.vineet at gmail.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License or (at your option) version 3 or any later version
- * accepted by the membership of KDE e.V. (or its successor approved
- * by the membership of KDE e.V.), which shall act as a proxy
- * defined in Section 14 of version 3 of the license.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <KLocalizedString>
-
-#include "core_debug.h"
-#include "daemon.h"
-#include "kdeconnectconfig.h"
-#include "loopbackdevicelink.h"
-#include "loopbackpairinghandler.h"
-#include "networkpackagetypes.h"
-
-LoopbackPairingHandler::LoopbackPairingHandler(const QString& deviceId)
-    : LanPairingHandler(deviceId)
-{
-
-}
-
-bool LoopbackPairingHandler::requestPairing()
-{
-    switch (pairStatus()) {
-        case PairStatus::Paired:
-            Q_EMIT pairingFailed(deviceLink()->name().append(" : Already paired").toLatin1().data());
-            return false;
-        case PairStatus::Requested:
-            Q_EMIT pairingFailed(deviceLink()->name().append(" : Pairing already requested for this device").toLatin1().data());
-            return false;
-        case PairStatus::RequestedByPeer:
-            qCDebug(KDECONNECT_CORE) << deviceLink()->name() << " : Pairing already started by the other end, accepting their request.";
-            acceptPairing();
-            return false;
-        case PairStatus::NotPaired:
-            ;
-    }
-
-    NetworkPackage np(PACKAGE_TYPE_PAIR);
-    createPairPackage(np);
-    setPairStatus(PairStatus::Requested);
-    m_pairingTimeout.start();
-    bool success = deviceLink()->sendPackage(np);
-    return success;
-}
-
-bool LoopbackPairingHandler::acceptPairing()
-{
-    NetworkPackage np(PACKAGE_TYPE_PAIR);
-    createPairPackage(np);
-    setPairStatus(PairStatus::Paired);
-    bool success = deviceLink()->sendPackage(np);
-    KdeConnectConfig::instance()->setDeviceProperty(m_deviceId, "certificate", QString::fromLatin1(KdeConnectConfig::instance()->certificate().toPem()));
-    return success;
-}
-
diff --git a/core/backends/loopback/loopbackpairinghandler.h b/core/backends/loopback/loopbackpairinghandler.h
deleted file mode 100644
index 5a28d90..0000000
--- a/core/backends/loopback/loopbackpairinghandler.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Copyright 2015 Vineet Garg <grg.vineet at gmail.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License or (at your option) version 3 or any later version
- * accepted by the membership of KDE e.V. (or its successor approved
- * by the membership of KDE e.V.), which shall act as a proxy
- * defined in Section 14 of version 3 of the license.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef KDECONNECT_LOOPBACKPAIRINGHANDLER_H
-#define KDECONNECT_LOOPBACKPAIRINGHANDLER_H
-
-#include "device.h"
-#include "../devicelink.h"
-#include "../lan/lanpairinghandler.h"
-
-// This class is used pairing related stuff. It has direct access to links and can directly send packages
-class LoopbackPairingHandler 
-    : public LanPairingHandler
-{
-public:
-    LoopbackPairingHandler(const QString& deviceId);
-    virtual ~LoopbackPairingHandler() { }
-
-    virtual bool requestPairing() Q_DECL_OVERRIDE;
-    virtual bool acceptPairing() Q_DECL_OVERRIDE;
-
-
-};
-
-
-#endif //KDECONNECT_LOOPBACKPAIRINGHANDLER_H

-- 
kdeconnect packaging