[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:15:18 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=5721ed2
The following commit has been merged in the master branch:
commit 5721ed2c302740c404ee2b57616436d09f8a2f7d
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 736d953..d8baeed 100644
--- a/presence/src/presence-applet.cpp
+++ b/presence/src/presence-applet.cpp
@@ -70,6 +70,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);
}
@@ -112,6 +114,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*)));
}
@@ -184,10 +187,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 4359fd3..0e25d8f 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
More information about the pkg-kde-commits
mailing list