[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=549a523

The following commit has been merged in the master branch:
commit 549a523d958d52a9a6f8b0964b8b3ff03701ef06
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Jul 2 12:50:46 2011 +0100

    Refactor header code for group chat situations.
    Show channel ID in header.
---
 lib/chat-widget.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index a418af4..8cb26b7 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -161,8 +161,13 @@ ChatWidget::ChatWidget(const Tp::TextChannelPtr & channel, const Tp::AccountPtr
 
     AdiumThemeHeaderInfo info;
     Tp::Contacts allContacts = d->channel->groupContacts();
+
     //normal chat - self and one other person.
-    if (allContacts.size() == 2) {
+    if (d->isGroupChat) {
+        info.setChatName(d->channel->targetId());
+    }
+    else
+    {
         //find the other contact which isn't self.
         foreach(const Tp::ContactPtr & it, allContacts) {
             if (it == d->channel->groupSelfContact()) {
@@ -174,13 +179,6 @@ ChatWidget::ChatWidget(const Tp::TextChannelPtr & channel, const Tp::AccountPtr
                 info.setIncomingIconPath(it->avatarData().fileName);
             }
         }
-    } else {
-        //some sort of group chat scenario.. Not sure how to create this yet.
-        info.setChatName("Group Chat");
-        d->isGroupChat = true;
-    }
-
-    if (!d->isGroupChat) {
         d->ui.contactsView->hide();
     }
 

-- 
ktp-text-ui packaging