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

The following commit has been merged in the master branch:
commit dc9fc623e4ee9b2d749d8f2914395d3a04244e38
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Thu Jan 29 19:30:04 2015 +0100

    [KTp/global-presence] Expose more properties to the QML applet
    
    Reviewed-by: David Edmundson
---
 KTp/global-presence.cpp | 10 ++++++++++
 KTp/global-presence.h   |  8 ++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/KTp/global-presence.cpp b/KTp/global-presence.cpp
index 4f4b764..7900e67 100644
--- a/KTp/global-presence.cpp
+++ b/KTp/global-presence.cpp
@@ -119,6 +119,11 @@ QString GlobalPresence::currentPresenceIconName() const
     return currentPresence().iconName();
 }
 
+QString GlobalPresence::currentPresenceName() const
+{
+    return currentPresence().displayString();
+}
+
 GlobalPresence::ConnectionPresenceType GlobalPresence::currentPresenceType() const
 {
     KTp::Presence p = currentPresence();
@@ -145,6 +150,11 @@ Presence GlobalPresence::requestedPresence() const
     return m_requestedPresence;
 }
 
+QString GlobalPresence::requestedPresenceName() const
+{
+    return m_requestedPresence.displayString();
+}
+
 bool GlobalPresence::isChangingPresence() const
 {
     return m_changingPresence;
diff --git a/KTp/global-presence.h b/KTp/global-presence.h
index ccfa10e..d1f5dab 100644
--- a/KTp/global-presence.h
+++ b/KTp/global-presence.h
@@ -50,9 +50,10 @@ class KTPCOMMONINTERNALS_EXPORT GlobalPresence : public QObject
     Q_PROPERTY(QIcon currentPresenceIcon READ currentPresenceIcon NOTIFY currentPresenceChanged)
     Q_PROPERTY(QString currentPresenceIconName READ currentPresenceIconName NOTIFY currentPresenceChanged)
     Q_PROPERTY(KTp::Presence currentPresence READ currentPresence NOTIFY currentPresenceChanged)
-
+    Q_PROPERTY(QString currentPresenceName READ currentPresenceName NOTIFY currentPresenceChanged);
     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 changingPresence)
 
 public:
     explicit GlobalPresence(QObject *parent = 0);
@@ -87,11 +88,14 @@ public:
     QIcon currentPresenceIcon() const;
     QString currentPresenceIconName() const;
     ConnectionPresenceType currentPresenceType() const;
+    QString currentPresenceName() const;
 
     /** The most online presence requested for any account if any of the accounts are changing state.
       otherwise returns current presence*/
     Presence requestedPresence() const;
 
+    QString requestedPresenceName() const;
+
     /** Returns true if any account is changing state (i.e connecting*/
     bool isChangingPresence() const;
 

-- 
ktp-common-internals packaging