[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=659b6fb

The following commit has been merged in the master branch:
commit 659b6fb57d1a1d37ccc9a661c707c894081936f8
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Sep 21 17:07:34 2010 +0000

    Set senderScreenName on outgoing messages
    
    svn path=/trunk/playground/network/telepathy-chat-handler/; revision=1177918
---
 lib/chatwindow.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/chatwindow.cpp b/lib/chatwindow.cpp
index 648c47f..8e27e08 100644
--- a/lib/chatwindow.cpp
+++ b/lib/chatwindow.cpp
@@ -79,9 +79,9 @@ void ChatWindow::handleIncomingMessage(const Tp::ReceivedMessage &message)
     if (m_chatviewlInitialised) {
         TelepathyChatMessageInfo messageInfo(TelepathyChatMessageInfo::RemoteToLocal);
         messageInfo.setMessage(message.text());
-        messageInfo.setSenderScreenName(message.sender()->id());
         messageInfo.setTime(message.received());
         messageInfo.setSenderDisplayName(message.sender()->alias());
+        messageInfo.setSenderScreenName(message.sender()->id());
 
         ui->chatArea->addMessage(messageInfo);
         m_chatConnection->channel()->acknowledge(QList<Tp::ReceivedMessage>() << message);
@@ -93,9 +93,10 @@ void ChatWindow::handleMessageSent(const Tp::Message &message, Tp::MessageSendin
     TelepathyChatMessageInfo messageInfo(TelepathyChatMessageInfo::LocalToRemote);
     messageInfo.setMessage(message.text());
     messageInfo.setTime(message.sent());
-    messageInfo.setSenderDisplayName(m_chatConnection->account()->displayName());
-    messageInfo.setSenderScreenName(m_chatConnection->account()->nickname());
 
+    Tp::ContactPtr sender = m_chatConnection->connection()->selfContact();
+    messageInfo.setSenderDisplayName(sender->alias());
+    messageInfo.setSenderScreenName(sender->id());
 
     ui->chatArea->addMessage(messageInfo);
 }

-- 
ktp-text-ui packaging