[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=6a171f4

The following commit has been merged in the master branch:
commit 6a171f472c4e8024d30f59f48506a88828fb355c
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Thu Apr 7 19:14:44 2011 +0200

    Initial avatars support plus KConfig for storing the selected avatar. This will hold all other settings in the future.
---
 models/accounts-model-item.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/models/accounts-model-item.cpp b/models/accounts-model-item.cpp
index c96921f..33e4467 100644
--- a/models/accounts-model-item.cpp
+++ b/models/accounts-model-item.cpp
@@ -136,7 +136,7 @@ QVariant AccountsModelItem::data(int role) const
     case AccountsModel::IdRole:
         return mPriv->mAccount->uniqueIdentifier();
     case AccountsModel::AvatarRole:
-        return QVariant(); //TODO: Return account icon
+        return QVariant::fromValue(mPriv->mAccount->avatar());
     case AccountsModel::ValidRole:
         return mPriv->mAccount->isValid();
     case AccountsModel::EnabledRole:
@@ -198,6 +198,9 @@ bool AccountsModelItem::setData(int role, const QVariant &value)
     case AccountsModel::NicknameRole:
         setNickname(value.toString());
         return true;
+    case AccountsModel::AvatarRole:
+        mPriv->mAccount->setAvatar(value.value<Tp::Avatar>());
+        return true;
     default:
         return false;
     }

-- 
ktp-common-internals packaging