[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=1720ddf

The following commit has been merged in the master branch:
commit 1720ddf093156d594f095e7cc83ed8d60a376cd4
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Feb 1 11:04:24 2013 +0000

    Add new role ContactPresenceNameRole
    
    Returns i18ns "Online" "Away" etc.
---
 KTp/Models/contacts-list-model.cpp | 4 ++++
 KTp/types.h                        | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/KTp/Models/contacts-list-model.cpp b/KTp/Models/contacts-list-model.cpp
index d993808..95ca282 100644
--- a/KTp/Models/contacts-list-model.cpp
+++ b/KTp/Models/contacts-list-model.cpp
@@ -110,12 +110,16 @@ QVariant KTp::ContactsListModel::data(const QModelIndex &index, int role) const
             return contact->avatarData().fileName;
         case KTp::ContactGroupsRole:
             return contact->groups();
+        
+        case KTp::ContactPresenceNameRole:
+            return contact->presence().displayString();
         case KTp::ContactPresenceMessageRole:
             return contact->presence().statusMessage();
         case KTp::ContactPresenceTypeRole:
             return contact->presence().type();
         case KTp::ContactPresenceIconRole:
             return contact->presence().iconName();
+        
         case KTp::ContactSubscriptionStateRole:
             return contact->subscriptionState();
           case KTp::ContactPublishStateRole:
diff --git a/KTp/types.h b/KTp/types.h
index d4ddcd8..9d76328 100644
--- a/KTp/types.h
+++ b/KTp/types.h
@@ -52,9 +52,12 @@ namespace KTp
         ContactClientTypesRole = Qt::UserRole + 2000, ///< stringlist. See Tp::Contact::ClientTypes
         ContactAvatarPathRole, ///<string. path to avatar file
         ContactGroupsRole, ///< stringlist. of all groups contact is in
+        
+        ContactPresenceNameRole,
         ContactPresenceMessageRole,
         ContactPresenceTypeRole,
         ContactPresenceIconRole,
+        
         ContactSubscriptionStateRole, ///< enum of type Tp::Contact::PresenceState
         ContactPublishStateRole, ///< enum of type Tp::Contact::PresenceState
         ContactIsBlockedRole, ///< bool, true if contact is blocked

-- 
ktp-common-internals packaging