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

The following commit has been merged in the master branch:
commit f8d506c794b3be7c5b491ac73ae7e61758207eba
Author: David Edmundson <davidedmundson at kde.org>
Date:   Fri Jun 13 18:48:13 2014 +0200

    Expose currentPresenceIconName for use by new presence applet
---
 KTp/global-presence.cpp |  5 +++++
 KTp/global-presence.h   | 11 +++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/KTp/global-presence.cpp b/KTp/global-presence.cpp
index a1fa319..08e268b 100644
--- a/KTp/global-presence.cpp
+++ b/KTp/global-presence.cpp
@@ -114,6 +114,11 @@ QIcon GlobalPresence::currentPresenceIcon() const
     return currentPresence().icon();
 }
 
+QString GlobalPresence::currentPresenceIconName() const
+{
+    return currentPresence().iconName();
+}
+
 GlobalPresence::ConnectionPresenceType GlobalPresence::currentPresenceType() const
 {
     KTp::Presence p = currentPresence();
diff --git a/KTp/global-presence.h b/KTp/global-presence.h
index 22db090..dd20d46 100644
--- a/KTp/global-presence.h
+++ b/KTp/global-presence.h
@@ -42,11 +42,17 @@ class KTP_EXPORT GlobalPresence : public QObject
 {
     Q_OBJECT
     Q_ENUMS(ConnectionPresenceType)
+    Q_PROPERTY(Tp::AccountManagerPtr accountManager READ accountManager WRITE addAccountManager)
+
     Q_PROPERTY(QString presenceMessage READ currentPresenceMessage NOTIFY currentPresenceChanged)
     Q_PROPERTY(ConnectionPresenceType presenceType READ currentPresenceType NOTIFY currentPresenceChanged)
-    Q_PROPERTY(Tp::AccountManagerPtr accountManager READ accountManager WRITE addAccountManager)
     Q_PROPERTY(QIcon currentPresenceIcon READ currentPresenceIcon NOTIFY currentPresenceChanged)
+    Q_PROPERTY(QString currentPresenceIconName READ currentPresenceIconName NOTIFY currentPresenceChanged)
+    Q_PROPERTY(KTp::Presence requestedPresence READ currentPresence NOTIFY currentPresenceChanged)
+
     Q_PROPERTY(KTp::Presence requestedPresence READ requestedPresence WRITE setPresence NOTIFY requestedPresenceChanged)
+
+
 public:
     explicit GlobalPresence(QObject *parent = 0);
 
@@ -76,6 +82,8 @@ public:
     /** The most online presence of any account*/
     Presence currentPresence() const;
     QString currentPresenceMessage() const;
+    QIcon currentPresenceIcon() const;
+    QString currentPresenceIconName() const;
     ConnectionPresenceType currentPresenceType() const;
 
     /** The most online presence requested for any account if any of the accounts are changing state.
@@ -90,7 +98,6 @@ public:
 
     Tp::AccountSetPtr onlineAccounts() const;
 
-    QIcon currentPresenceIcon() const;
 
 Q_SIGNALS:
     void requestedPresenceChanged(const KTp::Presence &customPresence);

-- 
ktp-common-internals packaging