[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=011f82f

The following commit has been merged in the master branch:
commit 011f82f6a1f7276354657086b440e83c94d25496
Author: Weng Xuetian <wengxt at gmail.com>
Date:   Thu Sep 5 13:55:41 2013 -0400

    Fix offline caused by disconnection is saved as last presence
    
    If connection detection is compiled in telepathy-mission-control, it
    will automatically set account offline thus onRequestedPresenceChanged
    will be triggered.
    
    User requested offline can be distringuished by connectionStatus ==
    Connected, thus we only save Presence Change if it is connected.
    
    REVIEW: 112524
---
 telepathy-module.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/telepathy-module.cpp b/telepathy-module.cpp
index 93f2717..57904b2 100644
--- a/telepathy-module.cpp
+++ b/telepathy-module.cpp
@@ -146,6 +146,13 @@ void TelepathyModule::onAccountManagerReady(Tp::PendingOperation* op)
 
 void TelepathyModule::onRequestedPresenceChanged(const KTp::Presence &presence)
 {
+    // the difference between user requested offline and network related offline is the connectionStatus is connected or not
+    // offline caused by network offline shold not be recorded as user requested.
+    if (presence.type() == Tp::ConnectionPresenceTypeOffline
+     && m_globalPresence->connectionStatus() != Tp::ConnectionStatusConnected) {
+        return;
+    }
+
     //if it's changed to what we set it to. Ignore it.
     if (presence == currentPluginPresence()) {
         return;

-- 
ktp-kded-integration-module packaging