[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=08cf383

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

    Fix auto-setting presence to Not Available, which didn't work because of a badly positioned bracket
---
 autoaway.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/autoaway.cpp b/autoaway.cpp
index 5448298..cb9b0e7 100644
--- a/autoaway.cpp
+++ b/autoaway.cpp
@@ -61,11 +61,11 @@ void AutoAway::timeoutReached(int id)
 
             setRequestedPresence(Tp::Presence::away());
             setActive(true);
-        } else if (id == m_extAwayTimeoutId) {
-            if (m_globalPresence->currentPresence().type() == Tp::Presence::away().type()) {
-                setRequestedPresence(Tp::Presence::xa());
-                setActive(true);
-            }
+        }
+    } else if (id == m_extAwayTimeoutId) {
+        if (m_globalPresence->currentPresence().type() == Tp::Presence::away().type()) {
+            setRequestedPresence(Tp::Presence::xa());
+            setActive(true);
         }
     }
 }

-- 
ktp-kded-integration-module packaging