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

The following commit has been merged in the master branch:
commit bd6c54218537dc730dcee68aae679eaf9640f522
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Feb 6 17:15:57 2013 +0000

    Use real name for self contact in plasmoid
---
 KTp/Declarative/messages-model.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/KTp/Declarative/messages-model.cpp b/KTp/Declarative/messages-model.cpp
index a4b4508..1c56e3d 100644
--- a/KTp/Declarative/messages-model.cpp
+++ b/KTp/Declarative/messages-model.cpp
@@ -178,7 +178,7 @@ void MessagesModel::onMessageSent(const Tp::Message &message, Tp::MessageSending
     KTp::Message ktpMessage = KTp::MessageProcessor::instance()->processMessage(message, d->account, d->textChannel);
 
     d->messages.append(MessageItem(
-                           i18n("Me"),   //FIXME : use actual nickname from Tp::AccountPtr
+                           d->account->nickname(),
                            ktpMessage.finalizedMessage(),
                            message.sent(),
                            message.messageType() == Tp::ChannelTextMessageTypeAction ? MessageTypeAction : MessageTypeOutgoing,

-- 
ktp-common-internals packaging