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

The following commit has been merged in the master branch:
commit c755154e55d26ffdf2159981bfbec88a17adf9de
Author: Aleix Pol <aleixpol at kde.org>
Date:   Wed Jul 2 00:54:44 2014 +0200

    Fix GlobalPresence metatype
    
    Exposes the enum so it can be used from the plasmoid.
    Also fixes a property name (copy paste bug?)
    
    REVIEW: 119063
---
 KTp/global-presence.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/KTp/global-presence.h b/KTp/global-presence.h
index dd20d46..701f88d 100644
--- a/KTp/global-presence.h
+++ b/KTp/global-presence.h
@@ -48,7 +48,7 @@ class KTP_EXPORT GlobalPresence : public QObject
     Q_PROPERTY(ConnectionPresenceType presenceType READ currentPresenceType NOTIFY currentPresenceChanged)
     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 currentPresence READ currentPresence NOTIFY currentPresenceChanged)
 
     Q_PROPERTY(KTp::Presence requestedPresence READ requestedPresence WRITE setPresence NOTIFY requestedPresenceChanged)
 
@@ -67,6 +67,7 @@ public:
         Unknown = Tp::ConnectionPresenceTypeUnknown,
         Error = Tp::ConnectionPresenceTypeError
     };
+    Q_ENUMS(ConnectionPresenceType)
 
     /** Set the account manager to use
       * @param accountManager should be ready.

-- 
ktp-common-internals packaging