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

The following commit has been merged in the master branch:
commit ba5f13ac4323dbaca339851e4095b99e905439aa
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Sep 20 16:15:45 2012 +0100

    Set plasmoid state to Passive if a user has no accounts.
    
    REVIEW: 106507
    BUG: 306761
---
 presence/src/presence-applet.cpp | 15 +++++++++++++++
 presence/src/presence-applet.h   |  1 +
 2 files changed, 16 insertions(+)

diff --git a/presence/src/presence-applet.cpp b/presence/src/presence-applet.cpp
index aa843c9..4beb5da 100644
--- a/presence/src/presence-applet.cpp
+++ b/presence/src/presence-applet.cpp
@@ -74,6 +74,8 @@ TelepathyPresenceApplet::TelepathyPresenceApplet(QObject *parent, const QVariant
 
     connect(m_globalPresence, SIGNAL(currentPresenceChanged(KTp::Presence)), this, SLOT(onPresenceChanged(KTp::Presence)));
 
+    setStatus(Plasma::PassiveStatus);
+
     // register plasmoid for tooltip
     Plasma::ToolTipManager::self()->registerWidget(this);
 }
@@ -116,6 +118,7 @@ void TelepathyPresenceApplet::init()
                                                   connectionFactory,
                                                   channelFactory);
 
+    connect(m_accountManager.data(), SIGNAL(newAccount(Tp::AccountPtr)), SLOT(onAccountsChanged()));
     connect(m_accountManager->becomeReady(), SIGNAL(finished(Tp::PendingOperation*)), this, SLOT(onAccountManagerReady(Tp::PendingOperation*)));
 }
 
@@ -191,10 +194,22 @@ void TelepathyPresenceApplet::onAccountManagerReady(Tp::PendingOperation* op)
         kDebug() << op->errorMessage();
     }
 
+    onAccountsChanged();
+
     // set the manager to the globalpresence
     m_globalPresence->setAccountManager(m_accountManager);
 }
 
+void TelepathyPresenceApplet::onAccountsChanged()
+{
+    //if connection to MC failed, or user has no accounts, hide presence icon.
+    if (m_accountManager->isValid() && m_accountManager->allAccounts().size() > 0) {
+        setStatus(Plasma::ActiveStatus);
+    } else {
+        setStatus(Plasma::PassiveStatus);
+    }
+}
+
 void TelepathyPresenceApplet::startAccountManager()
 {
     KToolInvocation::startServiceByDesktopName("kcm_ktp_accounts");
diff --git a/presence/src/presence-applet.h b/presence/src/presence-applet.h
index 2de67ac..5b462fc 100644
--- a/presence/src/presence-applet.h
+++ b/presence/src/presence-applet.h
@@ -56,6 +56,7 @@ public:
 
 private Q_SLOTS:
     void onAccountManagerReady(Tp::PendingOperation *op);
+    void onAccountsChanged();
 
     void onPresenceChanged(KTp::Presence presence);
     void onPresenceActionClicked();

-- 
ktp-contact-applet packaging