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

The following commit has been merged in the master branch:
commit c63d0ddd0678e9d335e57d821df7ed4807cda36d
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Mar 24 19:36:11 2011 +0000

    Added review comments
     - fixed a whitespace issue
     - show warning icon if user presence not known
    
    Review By: Martin Klapetek
    
    REVIEW: 100940
    BUG: 246009
    BUG: 265151
---
 lib/channel-contact-model.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/channel-contact-model.cpp b/lib/channel-contact-model.cpp
index e2886a5..8bdfdd6 100644
--- a/lib/channel-contact-model.cpp
+++ b/lib/channel-contact-model.cpp
@@ -22,7 +22,7 @@
 #include <KDebug>
 #include <KIcon>
 
-ChannelContactModel::ChannelContactModel(const Tp::TextChannelPtr & channel, QObject *parent)
+ChannelContactModel::ChannelContactModel(const Tp::TextChannelPtr &channel, QObject *parent)
     : QAbstractListModel(parent)
 {
     //add existing contacts
@@ -71,8 +71,8 @@ QVariant ChannelContactModel::data(const QModelIndex &index, int role) const
             //fall through
         case Tp::ConnectionPresenceTypeHidden:
             return QVariant(KIcon("im-user-offline"));
-        default:
-            return QVariant(KIcon("im-user"));
+        default: //presence unknown or error
+            return QVariant(KIcon("dialog-warning"));
         }
 
     default:
@@ -80,11 +80,11 @@ QVariant ChannelContactModel::data(const QModelIndex &index, int role) const
     }
 }
 
-void ChannelContactModel::onGroupMembersChanged(const Tp::Contacts & groupMembersAdded,
-                                             const Tp::Contacts & groupLocalPendingMembersAdded,
-                                             const Tp::Contacts & groupRemotePendingMembersAdded,
-                                             const Tp::Contacts & groupMembersRemoved,
-                                             const Tp::Channel::GroupMemberChangeDetails & details)
+void ChannelContactModel::onGroupMembersChanged(const Tp::Contacts &groupMembersAdded,
+                                             const Tp::Contacts &groupLocalPendingMembersAdded,
+                                             const Tp::Contacts &groupRemotePendingMembersAdded,
+                                             const Tp::Contacts &groupMembersRemoved,
+                                             const Tp::Channel::GroupMemberChangeDetails &details)
 {
     kDebug();
 
@@ -103,7 +103,8 @@ void ChannelContactModel::onContactPresenceChanged(const Tp::Presence &presence)
     QModelIndex index = createIndex(m_contacts.lastIndexOf(contact), 0);
     emit dataChanged(index, index);
 
-    emit contactPresenceChanged(contact, presence);}
+    emit contactPresenceChanged(contact, presence);
+}
 
 void ChannelContactModel::onContactAliasChanged(const QString &alias)
 {

-- 
ktp-text-ui packaging