[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=02bc1bc

The following commit has been merged in the master branch:
commit 02bc1bcd90357431a156f87388c354bf130682a5
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Sun Jun 21 19:42:57 2015 -0700

    Fixed progress indicator incorrectly being displayed after unpiring
---
 kcm/kcm.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/kcm/kcm.cpp b/kcm/kcm.cpp
index 28ea04b..00b3972 100644
--- a/kcm/kcm.cpp
+++ b/kcm/kcm.cpp
@@ -252,18 +252,18 @@ void KdeConnectKcm::pairingFailed(const QString& error)
     kcmUi->messages->animatedShow();
 }
 
-void KdeConnectKcm::pairingChanged(bool pairing)
+void KdeConnectKcm::pairingChanged(bool paired)
 {
     DeviceDbusInterface* senderDevice = (DeviceDbusInterface*) sender();
     devicesModel->deviceStatusChanged(senderDevice->id());
 
     if (senderDevice != currentDevice) return;
 
-    kcmUi->pair_button->setVisible(!pairing);
-    kcmUi->unpair_button->setVisible(pairing);
-    kcmUi->progressBar->setVisible(!pairing);
-    kcmUi->ping_button->setVisible(pairing);
-    kcmUi->status_label->setText(pairing ? i18n("(paired)") : i18n("(unpaired)"));
+    kcmUi->pair_button->setVisible(!paired);
+    kcmUi->unpair_button->setVisible(paired);
+    kcmUi->progressBar->setVisible(senderDevice->pairRequested());
+    kcmUi->ping_button->setVisible(paired);
+    kcmUi->status_label->setText(paired ? i18n("(paired)") : i18n("(unpaired)"));
 }
 
 void KdeConnectKcm::pluginsConfigChanged()

-- 
kdeconnect packaging