[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=9b63a9a

The following commit has been merged in the master branch:
commit 9b63a9af0941304953a3736e369b7a8a6c2e7494
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Tue Nov 22 19:48:50 2011 +0100

    Stop changing presence when the plugin is already deactivated
    
    Reviewed-by: David Edmundson
---
 telepathy-mpris.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/telepathy-mpris.cpp b/telepathy-mpris.cpp
index 2c00774..32fd5f2 100644
--- a/telepathy-mpris.cpp
+++ b/telepathy-mpris.cpp
@@ -195,6 +195,9 @@ void TelepathyMPRIS::onActivateNowPlaying()
 void TelepathyMPRIS::onDeactivateNowPlaying()
 {
     kDebug() << "Plugin deactivated on CL request";
-    m_presenceActivated = false;
-    setActive(false);
+
+    if (m_presenceActivated) {
+        m_presenceActivated = false;
+        setActive(false);
+    }
 }

-- 
ktp-kded-integration-module packaging