[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=c2620d6

The following commit has been merged in the master branch:
commit c2620d639c01ae3a78022a880fbfc1c9fbaad539
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Tue Mar 17 16:12:56 2015 +0100

    Compare only the presence types, not the whole Presence objects
    
    We actually don't care if say the presence message differs, we're only
    interested in the actual presence type
    
    This should fix an infinite busy wheel on the applet in some cases
---
 KTp/global-presence.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/KTp/global-presence.cpp b/KTp/global-presence.cpp
index c92685e..9c72d40 100644
--- a/KTp/global-presence.cpp
+++ b/KTp/global-presence.cpp
@@ -279,7 +279,7 @@ void GlobalPresence::onChangingPresence()
 {
     bool isChangingPresence = false;
     Q_FOREACH(const Tp::AccountPtr &account, m_enabledAccounts->accounts()) {
-        if (account->requestedPresence() != account->currentPresence()) {
+        if (account->requestedPresence().type() != account->currentPresence().type()) {
             isChangingPresence = true;
         }
     }

-- 
ktp-common-internals packaging