[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=1848e96

The following commit has been merged in the master branch:
commit 1848e96a9180108c9db8e99cec9ccad75a0cd061
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Thu Dec 17 05:54:37 2015 -0800

    Fixed old signal name
---
 core/daemon.cpp | 2 +-
 kcm/kcm.cpp     | 8 ++++----
 kcm/kcm.h       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/daemon.cpp b/core/daemon.cpp
index 91bb354..7e36e6d 100644
--- a/core/daemon.cpp
+++ b/core/daemon.cpp
@@ -183,7 +183,7 @@ void Daemon::onNewDeviceLink(const NetworkPackage& identityPackage, DeviceLink*
             device->deleteLater();
         } else {
             connect(device, SIGNAL(reachableStatusChanged()), this, SLOT(onDeviceStatusChanged()));
-            connect(device, SIGNAL(pairingChanged(bool)), this, SLOT(onDeviceStatusChanged()));
+            connect(device, SIGNAL(trustedChanged(bool)), this, SLOT(onDeviceStatusChanged()));
             d->mDevices[id] = device;
 
             Q_EMIT deviceAdded(id);
diff --git a/kcm/kcm.cpp b/kcm/kcm.cpp
index f62cdfa..72ebd93 100644
--- a/kcm/kcm.cpp
+++ b/kcm/kcm.cpp
@@ -193,8 +193,8 @@ void KdeConnectKcm::deviceSelected(const QModelIndex& current)
     resetDeviceView();
 
     connect(currentDevice, SIGNAL(pluginsChanged()), this, SLOT(resetCurrentDevice()));
-    connect(currentDevice, SIGNAL(pairingChanged(bool)), this, SLOT(pairingChanged(bool)));
-    connect(currentDevice, SIGNAL(pairingFailed(QString)), this, SLOT(pairingFailed(QString)));
+    connect(currentDevice, SIGNAL(trustedChanged(bool)), this, SLOT(trustedChanged(bool)));
+    connect(currentDevice, SIGNAL(pairingError(QString)), this, SLOT(pairingFailed(QString)));
 }
 
 void KdeConnectKcm::resetCurrentDevice()
@@ -266,13 +266,13 @@ void KdeConnectKcm::pairingFailed(const QString& error)
 {
     if (sender() != currentDevice) return;
 
-    pairingChanged(false);
+    trustedChanged(false);
 
     kcmUi->messages->setText(i18n("Error trying to pair: %1",error));
     kcmUi->messages->animatedShow();
 }
 
-void KdeConnectKcm::pairingChanged(bool paired)
+void KdeConnectKcm::trustedChanged(bool paired)
 {
     DeviceDbusInterface* senderDevice = (DeviceDbusInterface*) sender();
     if (senderDevice != currentDevice) return;
diff --git a/kcm/kcm.h b/kcm/kcm.h
index 890b2be..cdc2a3e 100644
--- a/kcm/kcm.h
+++ b/kcm/kcm.h
@@ -53,7 +53,7 @@ private Q_SLOTS:
     void pluginsConfigChanged();
     void sendPing();
     void resetSelection();
-    void pairingChanged(bool);
+    void trustedChanged(bool);
     void pairingFailed(const QString& error);
     void refresh();
     void renameShow();

-- 
kdeconnect packaging