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

The following commit has been merged in the master branch:
commit b72647c8f861b43870c4e0ffbfa226c6d6beefe7
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Fri Feb 6 17:12:05 2015 +0100

    [kpeople] Add the blocked property to the KPeople contact
---
 kpeople/datasourceplugin/im-persons-data-source.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kpeople/datasourceplugin/im-persons-data-source.cpp b/kpeople/datasourceplugin/im-persons-data-source.cpp
index ca9fa2b..1d162f3 100644
--- a/kpeople/datasourceplugin/im-persons-data-source.cpp
+++ b/kpeople/datasourceplugin/im-persons-data-source.cpp
@@ -153,11 +153,12 @@ void KTpAllContacts::loadCache()
         const QString contactId =  query.value(1).toString();
         addressee->insertProperty(AbstractContact::NameProperty, query.value(2).toString());
         addressee->insertProperty(AbstractContact::PictureProperty, QUrl::fromLocalFile(query.value(3).toString()));
+        addressee->insertProperty(S_KPEOPLE_PROPERTY_IS_BLOCKED, query.value(4).toBool());
 
         if (!groupsList.isEmpty()) {
             QVariantList contactGroups;
 
-            Q_FOREACH (const QString &groupIdStr, query.value(4).toString().split(QLatin1String(","))) {
+            Q_FOREACH (const QString &groupIdStr, query.value(5).toString().split(QLatin1String(","))) {
                 bool convSuccess;
                 int groupId = groupIdStr.toInt(&convSuccess);
                 if ((!convSuccess) || (groupId >= groupsList.count()))

-- 
ktp-common-internals packaging