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

The following commit has been merged in the master branch:
commit d9f3d7d9a2c23fd9112bfa8f3a821f0f8c08288a
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Mon Jul 29 20:53:37 2013 +0200

    Fix features requested from KPeople model
    
    Sneaky bug got in that populated the model only with contacts with
    avatars and groups, leaving the rest out.
    
    Reviewed-by: David Edmundson
---
 KTp/Models/contacts-model.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/KTp/Models/contacts-model.cpp b/KTp/Models/contacts-model.cpp
index dfa2c41..f9da1ae 100644
--- a/KTp/Models/contacts-model.cpp
+++ b/KTp/Models/contacts-model.cpp
@@ -75,10 +75,12 @@ KTp::ContactsModel::ContactsModel(QObject *parent)
         accountFeature.setOptional(false);
         accountFeature.setQueryPart(QLatin1String("?uri nco:hasIMAccount ?imAccount . ?imAccount nco:isAccessedBy ?accessedBy . ?accessedBy telepathy:accountIdentifier ?account . "));
 
-        personsModel->startQuery(QList<KPeople::PersonsModelFeature>() << KPeople::PersonsModelFeature::imModelFeature()
+        personsModel->startQuery(QList<KPeople::PersonsModelFeature>() << KPeople::PersonsModelFeature::imModelFeature(KPeople::PersonsModelFeature::Mandatory)
                                                             << accountFeature
-                                                            << KPeople::PersonsModelFeature::avatarModelFeature(KPeople::PersonsModelFeature::Mandatory)
-                                                            << KPeople::PersonsModelFeature::groupsModelFeature(KPeople::PersonsModelFeature::Mandatory));
+                                                            << KPeople::PersonsModelFeature::avatarModelFeature()
+                                                            << KPeople::PersonsModelFeature::groupsModelFeature()
+                                                            << KPeople::PersonsModelFeature::fullNameModelFeature()
+                                                            << KPeople::PersonsModelFeature::nicknameModelFeature());
         d->source = new KPeopleTranslationProxy(this);
         qobject_cast<KPeopleTranslationProxy*>(d->source)->setSourceModel(personsModel);
     } else

-- 
ktp-common-internals packaging