[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=2d2c0af

The following commit has been merged in the master branch:
commit 2d2c0aff53538d23e18d3e3cba64b4f2d141341e
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Dec 26 11:16:13 2011 +0000

    Add decoration role to accounts model
    
    REVIEW: 103532
---
 KTp/Models/accounts-model-item.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/KTp/Models/accounts-model-item.cpp b/KTp/Models/accounts-model-item.cpp
index a057714..feef5d9 100644
--- a/KTp/Models/accounts-model-item.cpp
+++ b/KTp/Models/accounts-model-item.cpp
@@ -28,6 +28,8 @@
 #include "accounts-model.h"
 #include "contact-model-item.h"
 
+#include <KIcon>
+
 struct AccountsModelItem::Private
 {
     Private(const Tp::AccountPtr &account)
@@ -151,6 +153,8 @@ QVariant AccountsModelItem::data(int role) const
     case AccountsModel::DisplayNameRole:
     case Qt::DisplayRole:
         return mPriv->mAccount->displayName();
+    case Qt::DecorationRole:
+        return KIcon(mPriv->mAccount->iconName());
     case AccountsModel::IconRole:
         return mPriv->mAccount->iconName();
     case AccountsModel::NicknameRole:

-- 
ktp-common-internals packaging