[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=84ffcfe

The following commit has been merged in the master branch:
commit 84ffcfed4becde0f0eafd0ca1d4d65982786ac26
Author: Abner Silva <abner.silva at kdemail.net>
Date:   Wed Aug 5 15:20:41 2009 +0000

    Now listening to global presence signals.
    
    svn path=/trunk/playground/base/plasma/applets/presence/; revision=1007347
---
 presence/src/presence.cpp | 19 +++++++++++++++++++
 presence/src/presence.h   |  2 ++
 2 files changed, 21 insertions(+)

diff --git a/presence/src/presence.cpp b/presence/src/presence.cpp
index 7521325..b338061 100644
--- a/presence/src/presence.cpp
+++ b/presence/src/presence.cpp
@@ -114,6 +114,13 @@ void PresenceApplet::initExtenderItem(Plasma::ExtenderItem *item)
         m_globalWidget->setLayout (m_globalLayout);
 
         m_global = new GlobalPresenceWidget(this);
+
+        // Listening for global changes
+        connect(m_global, SIGNAL(presenceStatusChanged(const QString&)),
+                this, SLOT(onGlobalPresenceStatusChanged(const QString&)));
+        connect(m_global, SIGNAL(presenceMessageChanged(const QString&)),
+                this, SLOT(onGlobalPresenceMessageChanged(const QString&)));
+
         m_globalLayout->addItem(m_global);
         item->setWidget(m_globalWidget);
         item->setTitle(i18n("Global Presence"));
@@ -349,6 +356,18 @@ void PresenceApplet::onJobCompleted()
         service->deleteLater();
 }
 
+void PresenceApplet::onGlobalPresenceStatusChanged(const QString &status)
+{
+    foreach (AccountWidget *account, m_accounts.values())
+        setSourcePresence(account->id(), status, account->presenceMessage());
+}
+
+void PresenceApplet::onGlobalPresenceMessageChanged(const QString &msg)
+{
+    foreach (AccountWidget *account, m_accounts.values())
+        setSourcePresence(account->id(), account->presenceStatus(), msg);
+}
+
 void PresenceApplet::updateSize()
 {
     ExtenderItem *item = extender()->item("Accounts");
diff --git a/presence/src/presence.h b/presence/src/presence.h
index a489a48..c002a58 100644
--- a/presence/src/presence.h
+++ b/presence/src/presence.h
@@ -57,6 +57,8 @@ private Q_SLOTS:
     void onPresenceChanged(const QString &presence,
             const QString &msg);
     void onJobCompleted();
+    void onGlobalPresenceStatusChanged(const QString &status);
+    void onGlobalPresenceMessageChanged(const QString &msg);
 
 protected:
     void initExtenderItem(Plasma::ExtenderItem *item);

-- 
ktp-contact-applet packaging