[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=4a6b473

The following commit has been merged in the master branch:
commit 4a6b4731a0a5a5d540f4d09a8136dcec504fd3d4
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Mar 24 02:49:14 2011 +0000

    Only show contact list if it is a group chat situation
    Plus fix compile
---
 lib/channel-contact-list.cpp | 4 ++--
 lib/chat-widget.cpp          | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/channel-contact-list.cpp b/lib/channel-contact-list.cpp
index d970725..8d496f8 100644
--- a/lib/channel-contact-list.cpp
+++ b/lib/channel-contact-list.cpp
@@ -136,8 +136,8 @@ void ChannelContactList::removeContacts(const Tp::Contacts &contacts)
         //I think this is needed as technically the contact itself hasn't actually been deleted even if we remove our pointers to it
         //and could be used referenced elsewhere in the chat application in a different tab.
         //if we don't disconnect could we still get notifications here about their status/presence changes even if a contact has left the room
-        disconnect(contact.data(), SIGNAL(aliasChanged(QString)), SLOT(onContactAliasChanged(QString)));
-        disconnect(contact.data(), SIGNAL(presenceChanged(Tp::Presence)), SLOT(onContactPresenceChanged(Tp::Presence)));
+        disconnect(contact.data(), SIGNAL(aliasChanged(QString)), this, SLOT(onContactAliasChanged(QString)));
+        disconnect(contact.data(), SIGNAL(presenceChanged(Tp::Presence)), this, SLOT(onContactPresenceChanged(Tp::Presence)));
 
         beginRemoveRows(QModelIndex(), m_contacts.indexOf(contact), m_contacts.indexOf(contact));
         m_contacts.removeAll(contact);
diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index cb50fe7..9ca8815 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -176,6 +176,10 @@ ChatWidget::ChatWidget(const Tp::TextChannelPtr & channel, QWidget *parent)
         d->isGroupChat = true;
     }
 
+    if (!d->isGroupChat) {
+        d->ui.contactsView->hide();
+    }
+
     info.setSourceName(d->channel->connection()->protocolName());
 
     //set up anything related to 'self'

-- 
ktp-text-ui packaging