[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=3de21ba

The following commit has been merged in the master branch:
commit 3de21ba54e6929e63620d46fb3f277446069348b
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Wed Apr 15 14:41:51 2015 +0200

    Expose "hasEnabledAccounts" as Q_PROPERTY
---
 KTp/global-presence.cpp | 3 +++
 KTp/global-presence.h   | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/KTp/global-presence.cpp b/KTp/global-presence.cpp
index d47a695..8f1148b 100644
--- a/KTp/global-presence.cpp
+++ b/KTp/global-presence.cpp
@@ -62,6 +62,7 @@ void GlobalPresence::setAccountManager(const Tp::AccountManagerPtr &accountManag
     onConnectionStatusChanged();
 
     connect(m_enabledAccounts.data(), SIGNAL(accountAdded(Tp::AccountPtr)), SLOT(onAccountAdded(Tp::AccountPtr)));
+    connect(m_enabledAccounts.data(), SIGNAL(accountRemoved(Tp::AccountPtr)), this, SIGNAL(enabledAccountsChanged()));
 }
 
 void GlobalPresence::addAccountManager(const Tp::AccountManagerPtr &accountManager)
@@ -203,6 +204,8 @@ void GlobalPresence::onAccountAdded(const Tp::AccountPtr &account)
     connect(account.data(), SIGNAL(connectionStatusChanged(Tp::ConnectionStatus)), SLOT(onConnectionStatusChanged()));
     connect(account.data(), SIGNAL(requestedPresenceChanged(Tp::Presence)), SLOT(onRequestedPresenceChanged()));
     connect(account.data(), SIGNAL(currentPresenceChanged(Tp::Presence)), SLOT(onCurrentPresenceChanged()));
+
+    Q_EMIT enabledAccountsChanged();
 }
 
 void GlobalPresence::onCurrentPresenceChanged()
diff --git a/KTp/global-presence.h b/KTp/global-presence.h
index 61a35bb..46e6cc3 100644
--- a/KTp/global-presence.h
+++ b/KTp/global-presence.h
@@ -54,6 +54,7 @@ class KTPCOMMONINTERNALS_EXPORT GlobalPresence : public QObject
     Q_PROPERTY(KTp::Presence requestedPresence READ requestedPresence WRITE setPresence NOTIFY requestedPresenceChanged)
     Q_PROPERTY(QString requestedPresenceName READ requestedPresenceName NOTIFY requestedPresenceChanged)
     Q_PROPERTY(bool isChangingPresence READ isChangingPresence NOTIFY connectionStatusChanged)
+    Q_PROPERTY(bool hasEnabledAccounts READ hasEnabledAccounts NOTIFY enabledAccountsChanged)
 
 public:
     explicit GlobalPresence(QObject *parent = 0);
@@ -111,6 +112,7 @@ Q_SIGNALS:
     void changingPresence(bool isChanging);
     void connectionStatusChanged(Tp::ConnectionStatus);
     void accountManagerReady();
+    void enabledAccountsChanged();
 
 public Q_SLOTS:
     /** Set all enabled accounts to the specified presence*/

-- 
ktp-common-internals packaging