[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=37406c9

The following commit has been merged in the master branch:
commit 37406c9c2bfa8f89c3388e43ef733d926ec499e1
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Thu Dec 15 11:26:02 2011 +0100

    Use KTp::Presence and save the presence while being destroyed (should happen only on logout), so it can be later restored on login
---
 telepathy-module.cpp | 5 ++++-
 telepathy-module.h   | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/telepathy-module.cpp b/telepathy-module.cpp
index 8ffd2a6..54e1d77 100644
--- a/telepathy-module.cpp
+++ b/telepathy-module.cpp
@@ -81,6 +81,7 @@ TelepathyModule::TelepathyModule(QObject* parent, const QList<QVariant>& args)
 
 TelepathyModule::~TelepathyModule()
 {
+    onPresenceChanged(m_globalPresence->currentPresence());
 }
 
 void TelepathyModule::onAccountManagerReady(Tp::PendingOperation* op)
@@ -91,6 +92,8 @@ void TelepathyModule::onAccountManagerReady(Tp::PendingOperation* op)
 
     m_globalPresence = new KTp::GlobalPresence(this);
     m_globalPresence->setAccountManager(m_accountManager);
+    connect(m_globalPresence, SIGNAL(currentPresenceChanged(KTp::Presence)),
+            this, SLOT(onPresenceChanged(KTp::Presence)));
 
     m_autoAway = new AutoAway(m_globalPresence, this);
     connect(m_autoAway, SIGNAL(activate(bool)),
@@ -110,7 +113,7 @@ void TelepathyModule::onAccountManagerReady(Tp::PendingOperation* op)
     m_contactHandler = new ContactRequestHandler(m_accountManager, this);
 }
 
-void TelepathyModule::onPresenceChanged(const Tp::Presence &presence)
+void TelepathyModule::onPresenceChanged(const KTp::Presence &presence)
 {
     //only save if the presence is not auto-set
     if (m_pluginStack.isEmpty()) {
diff --git a/telepathy-module.h b/telepathy-module.h
index cf06596..b0a9f3b 100644
--- a/telepathy-module.h
+++ b/telepathy-module.h
@@ -24,6 +24,7 @@
 #include <KDEDModule>
 
 #include <TelepathyQt/AccountManager>
+#include <KTelepathy/presence.h>
 
 class ContactRequestHandler;
 namespace Tp {
@@ -52,7 +53,7 @@ Q_SIGNALS:
 
 private Q_SLOTS:
     void onAccountManagerReady(Tp::PendingOperation*);
-    void onPresenceChanged(const Tp::Presence &presence);
+    void onPresenceChanged(const KTp::Presence &presence);
     void onPluginActivated(bool);
 
 private:

-- 
ktp-kded-integration-module packaging