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

The following commit has been merged in the master branch:
commit cbcfe0c1aef063f29dae003c2d13b67e464ff6f3
Author: Dominik Cermak <d.cermak at arcor.de>
Date:   Sat Jun 2 13:54:05 2012 +0200

    Fix presence saving
    
    Use the presence given as parameter.
    
    REVIEW: 105131
---
 telepathy-module.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/telepathy-module.cpp b/telepathy-module.cpp
index 0216c61..2085fea 100644
--- a/telepathy-module.cpp
+++ b/telepathy-module.cpp
@@ -135,13 +135,13 @@ void TelepathyModule::onRequestedPresenceChanged(const KTp::Presence &presence)
     KSharedConfigPtr config = KSharedConfig::openConfig(QLatin1String("ktelepathyrc"));
     KConfigGroup presenceConfig = config->group("LastPresence");
 
-    presenceConfig.writeEntry(QLatin1String("PresenceType"), (uint)m_globalPresence->currentPresence().type());
-    presenceConfig.writeEntry(QLatin1String("PresenceStatus"), m_globalPresence->currentPresence().status());
-    presenceConfig.writeEntry(QLatin1String("PresenceMessage"), m_globalPresence->currentPresence().statusMessage());
+    presenceConfig.writeEntry(QLatin1String("PresenceType"), (uint)presence.type());
+    presenceConfig.writeEntry(QLatin1String("PresenceStatus"), presence.status());
+    presenceConfig.writeEntry(QLatin1String("PresenceMessage"), presence.statusMessage());
 
     presenceConfig.sync();
 
-    m_autoConnect->setAutomaticPresence(m_globalPresence->currentPresence());
+    m_autoConnect->setAutomaticPresence(presence);
 }
 
 void TelepathyModule::onPluginActivated(bool active)

-- 
ktp-kded-integration-module packaging