[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=1b22b69

The following commit has been merged in the master branch:
commit 1b22b6975ec1a2e645c4b572c9c51464a33f7f9e
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Oct 2 14:49:50 2010 +0000

    Added method to ContactList to emit signal when the alias of any contact
    in the chat changes.
    
    svn path=/trunk/playground/network/telepathy-chat-handler/; revision=1181856
---
 lib/channelcontactlist.cpp | 6 ++++++
 lib/channelcontactlist.h   | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/lib/channelcontactlist.cpp b/lib/channelcontactlist.cpp
index 09f0ce6..31e3bfa 100644
--- a/lib/channelcontactlist.cpp
+++ b/lib/channelcontactlist.cpp
@@ -21,6 +21,7 @@ ChannelContactListContact::ChannelContactListContact(Tp::ContactPtr contact, QOb
 {
     m_contact = contact;
     connect(m_contact.data(), SIGNAL(simplePresenceChanged(const QString, uint, const QString)), SLOT(onSimplePresenceChanged(QString, uint)));
+    connect(m_contact.data(), SIGNAL(aliasChanged(QString)), SLOT(onAliasChanged(QString)));
 }
 
 void ChannelContactListContact::onSimplePresenceChanged(const QString &status, uint type)
@@ -29,6 +30,10 @@ void ChannelContactListContact::onSimplePresenceChanged(const QString &status, u
     Q_EMIT contactPresenceChanged(m_contact, type);
 }
 
+void ChannelContactListContact::onAliasChanged(const QString &alias)
+{
+    Q_EMIT contactAliasChanged(m_contact, alias);
+}
 
 ChannelContactList::ChannelContactList(Tp::TextChannelPtr channel, QObject *parent) :
         QObject(parent)
@@ -37,6 +42,7 @@ ChannelContactList::ChannelContactList(Tp::TextChannelPtr channel, QObject *pare
         //FIXME move this to a slot called "addContact" - also call this when chat gains a person.
         ChannelContactListContact*  contactProxy = new ChannelContactListContact(contact, this);
         connect(contactProxy, SIGNAL(contactPresenceChanged(Tp::ContactPtr, uint)), SIGNAL(contactPresenceChanged(Tp::ContactPtr, uint)));
+        connect(contactProxy, SIGNAL(contactAliasChanged(Tp::ContactPtr, QString)), SIGNAL(contactAliasChanged(Tp::ContactPtr, QString)));
     }
     connect(channel.data(), SIGNAL(groupMembersChanged(Tp::Contacts, Tp::Contacts, Tp::Contacts, Tp::Contacts, Tp::Channel::GroupMemberChangeDetails)),
             SLOT(groupMembersChanged(Tp::Contacts, Tp::Contacts, Tp::Contacts, Tp::Contacts, Tp::Channel::GroupMemberChangeDetails)));
diff --git a/lib/channelcontactlist.h b/lib/channelcontactlist.h
index 8c49fdf..7d10bec 100644
--- a/lib/channelcontactlist.h
+++ b/lib/channelcontactlist.h
@@ -15,9 +15,11 @@ public:
 
 signals:
     void contactPresenceChanged(Tp::ContactPtr contact, uint type);
+    void contactAliasChanged(Tp::ContactPtr contact, QString alias);
 
 private slots:
     void onSimplePresenceChanged(const QString &status, uint type);
+    void onAliasChanged(const QString &alias);
 
 private:
     Tp::ContactPtr m_contact;
@@ -34,6 +36,7 @@ public:
 
 signals:
     void contactPresenceChanged(Tp::ContactPtr contact, uint type);
+    void contactAliasChanged(Tp::ContactPtr contact, QString alias);
 
 public slots:
     void groupMembersChanged(const Tp::Contacts &groupMembersAdded,

-- 
ktp-text-ui packaging