[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=91c332b

The following commit has been merged in the master branch:
commit 91c332be852e0baa5328b6052b66bd179dbf0a8e
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Feb 2 14:01:51 2015 +0100

    Tp::Account::changingPresence is broken, compare requested and current presence instead
    
    Things like
    
    Presences:
         Current: offline
       Requested: offline
        Changing: yes
    
    are not unusual and this makes the applet keep spinning forever in such
    cases. Better to simply compare requested and current presence.
---
 KTp/global-presence.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/KTp/global-presence.cpp b/KTp/global-presence.cpp
index 7900e67..c92685e 100644
--- a/KTp/global-presence.cpp
+++ b/KTp/global-presence.cpp
@@ -201,7 +201,6 @@ void GlobalPresence::setPresence(GlobalPresence::ConnectionPresenceType p, QStri
 void GlobalPresence::onAccountAdded(const Tp::AccountPtr &account)
 {
     connect(account.data(), SIGNAL(connectionStatusChanged(Tp::ConnectionStatus)), SLOT(onConnectionStatusChanged()));
-    connect(account.data(), SIGNAL(changingPresence(bool)), SLOT(onChangingPresence()));
     connect(account.data(), SIGNAL(requestedPresenceChanged(Tp::Presence)), SLOT(onRequestedPresenceChanged()));
     connect(account.data(), SIGNAL(currentPresenceChanged(Tp::Presence)), SLOT(onCurrentPresenceChanged()));
 }
@@ -251,6 +250,8 @@ void GlobalPresence::onCurrentPresenceChanged()
         m_currentPresence = Presence(highestCurrentPresence);
         Q_EMIT currentPresenceChanged(m_currentPresence);
     }
+
+    onChangingPresence();
 }
 
 void GlobalPresence::onRequestedPresenceChanged()
@@ -270,13 +271,15 @@ void GlobalPresence::onRequestedPresenceChanged()
         onCurrentPresenceChanged();
         Q_EMIT requestedPresenceChanged(m_requestedPresence);
     }
+
+    onChangingPresence();
 }
 
 void GlobalPresence::onChangingPresence()
 {
     bool isChangingPresence = false;
     Q_FOREACH(const Tp::AccountPtr &account, m_enabledAccounts->accounts()) {
-        if (account->isChangingPresence()) {
+        if (account->requestedPresence() != account->currentPresence()) {
             isChangingPresence = true;
         }
     }

-- 
ktp-common-internals packaging