[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=3712ae4

The following commit has been merged in the master branch:
commit 3712ae4d40780ede28974fc5e0bd0ff2e5834f01
Author: Lasath Fernando <kde at lasath.org>
Date:   Sun Mar 3 10:42:19 2013 +1100

    Set senderAvatar correctly in KTp::Message ctor
---
 KTp/message.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/KTp/message.cpp b/KTp/message.cpp
index eb35e1a..a7bc6c2 100644
--- a/KTp/message.cpp
+++ b/KTp/message.cpp
@@ -104,17 +104,20 @@ Message::Message(const Tpl::TextEventPtr &original, const KTp::MessageContext &c
     d->messageType = original->messageType();
     d->isHistory = true;
 
+    setProperty("senderName", original->sender()->alias());
+    setProperty("senderId", original->sender()->identifier());
+
     if (original->sender()->identifier() == context.account()->normalizedName()) {
         d->direction = KTp::Message::LocalToRemote;
+        setProperty("senderAvatar", context.account()->
+                    connection()->selfContact()->avatarData().fileName);
     } else {
         d->direction = KTp::Message::RemoteToLocal;
+        setProperty("senderAvatar",
+                    context.channel()->targetContact()->avatarData().fileName);
     }
 
     setMainMessagePart(original->message());
-
-    setProperty("senderName", original->sender()->alias());
-    setProperty("senderAvatar", original->sender()->avatarToken());
-    setProperty("senderId", original->sender()->identifier());
 }
 
 Message::Message(const Message& other):

-- 
ktp-common-internals packaging