[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/15.12.1-2-382-gbd961c2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-kded-module.git;a=commitdiff;h=3a782e2

The following commit has been merged in the master branch:
commit 3a782e29af8113cd87a08b628761922365926b77
Author: Weng Xuetian <wengxt at gmail.com>
Date:   Fri May 4 20:28:00 2012 +0800

    fix autoway not aware invisible.
---
 autoaway.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/autoaway.cpp b/autoaway.cpp
index 24daab7..7bde000 100644
--- a/autoaway.cpp
+++ b/autoaway.cpp
@@ -59,8 +59,8 @@ void AutoAway::timeoutReached(int id)
     }
     KIdleTime::instance()->catchNextResumeEvent();
     if (id == m_awayTimeoutId) {
-        if (m_globalPresence->currentPresence().type() != Tp::Presence::away().type() ||
-            m_globalPresence->currentPresence().type() != Tp::Presence::xa().type() ||
+        if (m_globalPresence->currentPresence().type() != Tp::Presence::away().type() &&
+            m_globalPresence->currentPresence().type() != Tp::Presence::xa().type() &&
             m_globalPresence->currentPresence().type() != Tp::Presence::hidden().type()) {
 
             setRequestedPresence(Tp::Presence::away(m_awayMessage));

-- 
ktp-kded-integration-module packaging