[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=62ffc69

The following commit has been merged in the master branch:
commit 62ffc697f71d9165860aca3dc8bd7ad43f53cc6f
Author: Dominik Cermak <d.cermak at arcor.de>
Date:   Sat Jun 2 09:33:13 2012 +0200

    Fix logic in onRequestedPresenceChanged()
    
    statusMessage was missing before and it should be 'or' instead of 'and'.
    Now it's the same as in onCurrentPresenceChanged().
    This fixes presence saving in the case that only the presence message
    changed.
    
    REVIEW: 105133
---
 KTp/global-presence.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/KTp/global-presence.cpp b/KTp/global-presence.cpp
index 985148a..5f96cde 100644
--- a/KTp/global-presence.cpp
+++ b/KTp/global-presence.cpp
@@ -128,8 +128,9 @@ void GlobalPresence::onRequestedPresenceChanged()
         }
     }
 
-    if (highestRequestedPresence.type() != m_requestedPresence.type() &&
-            highestRequestedPresence.status() != m_requestedPresence.status()) {
+    if (highestRequestedPresence.type() != m_requestedPresence.type() ||
+            highestRequestedPresence.status() != m_requestedPresence.status() ||
+            highestRequestedPresence.statusMessage() != m_requestedPresence.statusMessage()) {
         m_requestedPresence = Presence(highestRequestedPresence);
         Q_EMIT requestedPresenceChanged(m_requestedPresence);
     }

-- 
ktp-common-internals packaging