[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=40e4e57

The following commit has been merged in the master branch:
commit 40e4e57be8dcfd52db619870a4dc2da7d837ecb8
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Apr 1 14:05:35 2015 +0200

    Use connectionStatus to show if we're changing presence
    
    This uses the same metric to show the spinner in the contact list and
    the plasmoid.
    
    It stops it spinning eternally and saves plasma-shell's CPU rendering a
    spinning thing forever.
    
    This patch is a minimal change that I want to put into 15.04 that
    doesn't  alter API.
    
    REVIEW: 123207
---
 KTp/global-presence.cpp | 2 +-
 KTp/global-presence.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/KTp/global-presence.cpp b/KTp/global-presence.cpp
index 9c72d40..d47a695 100644
--- a/KTp/global-presence.cpp
+++ b/KTp/global-presence.cpp
@@ -157,7 +157,7 @@ QString GlobalPresence::requestedPresenceName() const
 
 bool GlobalPresence::isChangingPresence() const
 {
-    return m_changingPresence;
+    return connectionStatus() == Tp::ConnectionStatusConnecting;
 }
 
 void GlobalPresence::setPresence(const KTp::Presence &presence)
diff --git a/KTp/global-presence.h b/KTp/global-presence.h
index d1f5dab..61a35bb 100644
--- a/KTp/global-presence.h
+++ b/KTp/global-presence.h
@@ -53,7 +53,7 @@ class KTPCOMMONINTERNALS_EXPORT GlobalPresence : public QObject
     Q_PROPERTY(QString currentPresenceName READ currentPresenceName NOTIFY currentPresenceChanged);
     Q_PROPERTY(KTp::Presence requestedPresence READ requestedPresence WRITE setPresence NOTIFY requestedPresenceChanged)
     Q_PROPERTY(QString requestedPresenceName READ requestedPresenceName NOTIFY requestedPresenceChanged)
-    Q_PROPERTY(bool isChangingPresence READ isChangingPresence NOTIFY changingPresence)
+    Q_PROPERTY(bool isChangingPresence READ isChangingPresence NOTIFY connectionStatusChanged)
 
 public:
     explicit GlobalPresence(QObject *parent = 0);

-- 
ktp-common-internals packaging