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

The following commit has been merged in the master branch:
commit f730507fa460964a315169d8f3d926f40c906f6a
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Feb 25 23:44:31 2014 +0100

    Avoid ever bringing offline accounts online
    
    Reviewed-by: Martin Klapetek
    BUG: 331386
---
 telepathy-module.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/telepathy-module.cpp b/telepathy-module.cpp
index 5eb70e2..030a0d9 100644
--- a/telepathy-module.cpp
+++ b/telepathy-module.cpp
@@ -190,9 +190,7 @@ KTp::Presence TelepathyModule::presenceThrottle()
 void TelepathyModule::setPresence(const KTp::Presence &presence)
 {
     Q_FOREACH(const Tp::AccountPtr &account, KTp::accountManager()->allAccounts()) {
-        if (account->isEnabled() &&
-            (account->connectionStatusReason() == Tp::ConnectionStatusReasonNoneSpecified ||
-             account->connectionStatusReason() == Tp::ConnectionStatusReasonRequested)) {
+        if (account->requestedPresence() != Tp::Presence::offline()) {
             account->setRequestedPresence(presence);
         }
     }

-- 
ktp-kded-integration-module packaging