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

The following commit has been merged in the master branch:
commit efb82296c6a3aed757fa48267ab5bc6940b21bc6
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Thu Oct 27 15:00:07 2011 +0200

    Change m_currentPresence even if the Tp::Presence::statusMessage() was changed. Also couple of minor fixes.
---
 global-presence.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/global-presence.cpp b/global-presence.cpp
index abc0db1..3bbd5c9 100644
--- a/global-presence.cpp
+++ b/global-presence.cpp
@@ -105,12 +105,13 @@ void GlobalPresence::onCurrentPresenceChanged()
         }
     }
 
-    qDebug() << "current presence changed";
+    kDebug() << "Current presence changed";
 
     if (highestCurrentPresence.type() != m_currentPresence.type() ||
-            highestCurrentPresence.status() != m_requestedPresence.status()) {
+            highestCurrentPresence.status() != m_currentPresence.status() ||
+            highestCurrentPresence.statusMessage() != m_currentPresence.statusMessage()) {
+
         m_currentPresence = highestCurrentPresence;
-        qDebug() << "emit";
         Q_EMIT currentPresenceChanged(m_currentPresence);
     }
 }
@@ -120,7 +121,7 @@ void GlobalPresence::onRequestedPresenceChanged()
     Tp::Presence highestRequestedPresence = Tp::Presence::offline();
     Q_FOREACH(const Tp::AccountPtr &account, m_enabledAccounts->accounts()) {
         if (m_presenceSorting[account->requestedPresence().type()] < m_presenceSorting[highestRequestedPresence.type()]) {
-            highestRequestedPresence = account->currentPresence();
+            highestRequestedPresence = account->requestedPresence();
         }
     }
 
@@ -157,11 +158,13 @@ bool GlobalPresence::hasEnabledAccounts() const
 
 void GlobalPresence::saveCurrentPresence()
 {
+    kDebug() << "Saving presence with message:" << m_currentPresence.statusMessage();
     m_savedPresence = m_currentPresence;
 }
 
 void GlobalPresence::restoreSavedPresence()
 {
+    kDebug() << m_savedPresence.statusMessage();
     setPresence(m_savedPresence);
 }
 

-- 
ktp-common-internals packaging