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

The following commit has been merged in the master branch:
commit ee4c6120e006c5adda8fdf2d4390f0cb9f62ff9d
Author: Aleix Pol <aleixpol at kde.org>
Date:   Sun Apr 13 18:42:21 2014 +0200

    Improve usability of the GlobalPresence QtQuick bindings
    
    Notifies about presence changes when presence changes.
    Exposes the icon so that it can be displayed on UI, Tp::Presence is not a
    QObject so it can't be introspected.
    Name the QtQuick binding the same way as the class name, otherwise it's
    confusing.
    
    REVIEW: 117545
---
 KTp/Declarative/qml-plugins.cpp | 2 +-
 KTp/global-presence.cpp         | 5 +++++
 KTp/global-presence.h           | 7 +++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/KTp/Declarative/qml-plugins.cpp b/KTp/Declarative/qml-plugins.cpp
index f074cd4..7b1d7ee 100644
--- a/KTp/Declarative/qml-plugins.cpp
+++ b/KTp/Declarative/qml-plugins.cpp
@@ -62,7 +62,7 @@ void QmlPlugins::registerTypes(const char *uri)
     qmlRegisterUncreatableType<MessagesModel> (uri, 0, 1, "MessagesModel",
         QLatin1String("It will be created once the conversation is created"));
 
-    qmlRegisterType<KTp::GlobalPresence> (uri, 0, 1, "PresenceManager");
+    qmlRegisterType<KTp::GlobalPresence> (uri, 0, 1, "GlobalPresence");
 
     qmlRegisterType<TelepathyManager>();
     qmlRegisterType<ConversationsModel>();
diff --git a/KTp/global-presence.cpp b/KTp/global-presence.cpp
index f7f1c95..332168b 100644
--- a/KTp/global-presence.cpp
+++ b/KTp/global-presence.cpp
@@ -109,6 +109,11 @@ QString GlobalPresence::currentPresenceMessage() const
     return p.statusMessage();
 }
 
+QIcon GlobalPresence::currentPresenceIcon() const
+{
+    return currentPresence().icon();
+}
+
 GlobalPresence::ConnectionPresenceType GlobalPresence::currentPresenceType() const
 {
     KTp::Presence p = currentPresence();
diff --git a/KTp/global-presence.h b/KTp/global-presence.h
index 226bed1..3f0bbcf 100644
--- a/KTp/global-presence.h
+++ b/KTp/global-presence.h
@@ -42,9 +42,10 @@ class KTP_EXPORT GlobalPresence : public QObject
 {
     Q_OBJECT
     Q_ENUMS(ConnectionPresenceType)
-    Q_PROPERTY(QString presenceMessage READ currentPresenceMessage CONSTANT)
-    Q_PROPERTY(ConnectionPresenceType presenceType READ currentPresenceType CONSTANT)
+    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)
 public:
     explicit GlobalPresence(QObject *parent = 0);
 
@@ -88,6 +89,8 @@ public:
 
     Tp::AccountSetPtr onlineAccounts() const;
 
+    QIcon currentPresenceIcon() const;
+
 Q_SIGNALS:
     void requestedPresenceChanged(const KTp::Presence &customPresence);
     void currentPresenceChanged(const KTp::Presence &presence);

-- 
ktp-common-internals packaging