[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=43431b2

The following commit has been merged in the master branch:
commit 43431b23b467308fd1e50699387bcaa442b11461
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Apr 13 14:23:00 2014 +0200

    Connect contact signals in chat plasmoid
    
    REVIEW: 117537
    BUG: 333373
---
 KTp/Declarative/conversation.cpp |  6 ++++++
 KTp/Declarative/conversation.h   | 12 ++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/KTp/Declarative/conversation.cpp b/KTp/Declarative/conversation.cpp
index 5c3ba0b..d963a90 100644
--- a/KTp/Declarative/conversation.cpp
+++ b/KTp/Declarative/conversation.cpp
@@ -69,6 +69,12 @@ Conversation::Conversation(const Tp::TextChannelPtr &channel,
     } else {
         d->isGroupChat = false;
         d->targetContact = KTp::ContactPtr::qObjectCast(channel->targetContact());
+
+        connect(d->targetContact.constData(), SIGNAL(aliasChanged(QString)), SIGNAL(titleChanged()));
+        connect(d->targetContact.constData(), SIGNAL(presenceChanged(Tp::Presence)), SIGNAL(presenceIconChanged()));
+        connect(d->targetContact.constData(), SIGNAL(avatarDataChanged(Tp::AvatarData)), SIGNAL(avatarChanged()));
+
+
         connect(d->targetContact.constData(), SIGNAL(aliasChanged(QString)),
                 this, SLOT(onTargetContactAliasChanged(QString)));
         connect(d->targetContact.constData(), SIGNAL(avatarDataChanged(Tp::AvatarData)),
diff --git a/KTp/Declarative/conversation.h b/KTp/Declarative/conversation.h
index 6b28385..c526d73 100644
--- a/KTp/Declarative/conversation.h
+++ b/KTp/Declarative/conversation.h
@@ -35,9 +35,9 @@ class Conversation : public QObject
 
     Q_PROPERTY(MessagesModel *messages READ messages CONSTANT)
     Q_PROPERTY(bool valid READ isValid NOTIFY validityChanged)
-    Q_PROPERTY(QString title READ title CONSTANT)
-    Q_PROPERTY(QIcon presenceIcon READ presenceIcon CONSTANT)
-    Q_PROPERTY(QIcon avatar READ avatar CONSTANT)
+    Q_PROPERTY(QString title READ title NOTIFY titleChanged)
+    Q_PROPERTY(QIcon presenceIcon READ presenceIcon NOTIFY presenceIconChanged)
+    Q_PROPERTY(QIcon avatar READ avatar NOTIFY avatarChanged)
     Q_PROPERTY(Tp::AccountPtr account READ account CONSTANT)
     Q_PROPERTY(KTp::ContactPtr targetContact READ targetContact CONSTANT)
 
@@ -64,9 +64,9 @@ public:
 
 Q_SIGNALS:
     void validityChanged(bool isValid);
-    void avatarChanged(QIcon avatar);
-    void titleChanged(QString title);
-    void presenceIconChanged(QIcon icon);
+    void avatarChanged();
+    void titleChanged();
+    void presenceIconChanged();
     void conversationCloseRequested();
 
 public Q_SLOTS:

-- 
ktp-common-internals packaging