[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=0e2ca35

The following commit has been merged in the master branch:
commit 0e2ca35f3d9891df683e5333a8fec8126a9fe53a
Author: Dominik Cermak <d.cermak at arcor.de>
Date:   Sat Dec 17 14:15:49 2011 +0100

    Don't crash on multi user chat
    
    Move the call to targetContact() in the block for normal chat because
    it can't be used with a targetHandleType() != Contact.
    
    REVIEW: 103437
---
 lib/chat-widget.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index dbac767..dad52f2 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -121,7 +121,6 @@ ChatWidget::ChatWidget(const Tp::TextChannelPtr & channel, const Tp::AccountPtr
     d->ui.contactsView->setModel(d->contactModel);
 
     d->yourName = channel->groupSelfContact()->alias();
-    d->contactName = channel->targetContact()->alias();
 
     d->ui.chatArea->load((d->isGroupChat?AdiumThemeView::GroupChat:AdiumThemeView::SingleUserChat));
 
@@ -137,6 +136,7 @@ ChatWidget::ChatWidget(const Tp::TextChannelPtr & channel, const Tp::AccountPtr
 
         Q_ASSERT(otherContact);
 
+        d->contactName = otherContact->alias();
         info.setDestinationDisplayName(otherContact->alias());
         info.setDestinationName(otherContact->id());
         info.setChatName(otherContact->alias());

-- 
ktp-text-ui packaging