[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=2529a7b

The following commit has been merged in the master branch:
commit 2529a7b1514a2e935d45e0ca04369d6dfe7ee957
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Mar 22 12:56:52 2012 +0000

    Add presence icon role to model
    
    REVIEW: 104360
---
 KTp/Models/accounts-model.cpp     | 1 +
 KTp/Models/accounts-model.h       | 1 +
 KTp/Models/contact-model-item.cpp | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/KTp/Models/accounts-model.cpp b/KTp/Models/accounts-model.cpp
index 0b0971b..795a1f4 100644
--- a/KTp/Models/accounts-model.cpp
+++ b/KTp/Models/accounts-model.cpp
@@ -94,6 +94,7 @@ AccountsModel::AccountsModel(QObject *parent)
     roles[AliasRole] = "aliasName";
     roles[AvatarRole] = "avatar";
     roles[PresenceRole] = "presence";
+    roles[PresenceIconRole] = "presenceIcon";
     roles[PresenceStatusRole] = "presenceStatus";
     roles[PresenceTypeRole] = "presenceType";
     roles[PresenceMessageRole] = "presenceMessage";
diff --git a/KTp/Models/accounts-model.h b/KTp/Models/accounts-model.h
index a0b6d17..23f901d 100644
--- a/KTp/Models/accounts-model.h
+++ b/KTp/Models/accounts-model.h
@@ -77,6 +77,7 @@ public:
         // contact roles
         AliasRole,
         PresenceRole,
+        PresenceIconRole,
         PresenceStatusRole,
         PresenceTypeRole,
         PresenceMessageRole,
diff --git a/KTp/Models/contact-model-item.cpp b/KTp/Models/contact-model-item.cpp
index b7fd6de..a1a44b2 100644
--- a/KTp/Models/contact-model-item.cpp
+++ b/KTp/Models/contact-model-item.cpp
@@ -110,6 +110,8 @@ QVariant ContactModelItem::data(int role) const
         return mPriv->mContact->alias();
     case AccountsModel::PresenceRole:
         return QVariant::fromValue(KTp::Presence(mPriv->mContact->presence()));
+    case AccountsModel::PresenceIconRole:
+        return QIcon(KTp::Presence(mPriv->mContact->presence()).icon());
     case AccountsModel::PresenceStatusRole:
         return mPriv->mContact->presence().status();
     case AccountsModel::PresenceTypeRole:

-- 
ktp-common-internals packaging