[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=6510aa2

The following commit has been merged in the master branch:
commit 6510aa20ece700d845a9a984a0f84205e0374e3a
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Jan 19 19:58:29 2012 +0000

    Use connectionStatus for the spinner rather than changingPresence.
    
    REVIEW: 103738
    CCBUG: 284480
---
 global-presence-chooser.cpp | 6 +++---
 global-presence-chooser.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/global-presence-chooser.cpp b/global-presence-chooser.cpp
index 8ebfc1c..d935f76 100644
--- a/global-presence-chooser.cpp
+++ b/global-presence-chooser.cpp
@@ -178,7 +178,7 @@ GlobalPresenceChooser::GlobalPresenceChooser(QWidget *parent) :
 
     connect(this, SIGNAL(activated(int)), SLOT(onCurrentIndexChanged(int)));
     connect(m_globalPresence, SIGNAL(currentPresenceChanged(KTp::Presence)), SLOT(onPresenceChanged(KTp::Presence)));
-    connect(m_globalPresence, SIGNAL(changingPresence(bool)), SLOT(onPresenceChanging(bool)));
+    connect(m_globalPresence, SIGNAL(connectionStatusChanged(Tp::ConnectionStatus)), SLOT(onConnectionStatusChanged(Tp::ConnectionStatus)));
 
     onPresenceChanged(m_globalPresence->currentPresence());
 }
@@ -361,9 +361,9 @@ void GlobalPresenceChooser::onPresenceChanged(const KTp::Presence &presence)
     setCurrentIndex(index.row());
 }
 
-void GlobalPresenceChooser::onPresenceChanging(bool isChanging)
+void GlobalPresenceChooser::onConnectionStatusChanged(Tp::ConnectionStatus connectionStatus)
 {
-    if (isChanging) {
+    if (connectionStatus == Tp::ConnectionStatusConnecting) {
         repositionSpinner();
         m_busyOverlay->start();
     } else {
diff --git a/global-presence-chooser.h b/global-presence-chooser.h
index 2c4a0ec..e57cfdc 100644
--- a/global-presence-chooser.h
+++ b/global-presence-chooser.h
@@ -49,7 +49,7 @@ protected:
 private slots:
     void onCurrentIndexChanged(int index);
     void onPresenceChanged(const KTp::Presence &presence);
-    void onPresenceChanging(bool isChanging);
+    void onConnectionStatusChanged(Tp::ConnectionStatus connectionStatus);
 
 private:
     KTp::GlobalPresence *m_globalPresence;

-- 
ktp-contact-list packaging