[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=95cbc13

The following commit has been merged in the master branch:
commit 95cbc13fa9de3cccc602c20edf8ae173ffdb6cd1
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Mon Sep 16 15:46:28 2013 +0200

    Fixed KCM updating the wrong device if selection was changed
    
    Info displayed when pairing was always shown in the currently selected
    device
---
 kcm/kcm.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/kcm/kcm.cpp b/kcm/kcm.cpp
index 61d41da..b4be11d 100644
--- a/kcm/kcm.cpp
+++ b/kcm/kcm.cpp
@@ -86,7 +86,6 @@ void KdeConnectKcm::resetSelection()
     kcmUi->deviceList->selectionModel()->setCurrentIndex(sortProxyModel->mapFromSource(currentIndex), QItemSelectionModel::ClearAndSelect);
 }
 
-
 void KdeConnectKcm::deviceSelected(const QModelIndex& current)
 {
 
@@ -182,6 +181,8 @@ void KdeConnectKcm::unpair()
 
 void KdeConnectKcm::pairingFailed(const QString& error)
 {
+    if (sender() != currentDevice) return;
+
     kcmUi->messages->setText(i18n("Error trying to pair: %1",error));
     kcmUi->messages->animatedShow();
     kcmUi->progressBar->setVisible(false);
@@ -190,14 +191,17 @@ void KdeConnectKcm::pairingFailed(const QString& error)
 
 void KdeConnectKcm::pairingSuccesful()
 {
+    DeviceDbusInterface* sender = (DeviceDbusInterface*) sender();
+    devicesModel->deviceStatusChanged(sender->id());
+
+    if (sender != currentDevice) return;
+
     kcmUi->progressBar->setVisible(false);
     kcmUi->unpair_button->setVisible(true);
     kcmUi->pair_button->setVisible(false);
     kcmUi->ping_button->setVisible(true);
 
     kcmUi->status_label->setText(i18n("(paired)"));
-
-    devicesModel->deviceStatusChanged(currentDevice->id());
 }
 
 void KdeConnectKcm::pluginsConfigChanged()

-- 
kdeconnect packaging