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

The following commit has been merged in the master branch:
commit fb225eec9007f0cf881d9a2f2a55c986f66be47b
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Nov 16 11:45:45 2013 +0100

    Set contact groups abusing the vcard category role
---
 KTp/Models/kpeopletranslationproxy.cpp | 4 ++--
 KTp/im-persons-data-source.cpp         | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/KTp/Models/kpeopletranslationproxy.cpp b/KTp/Models/kpeopletranslationproxy.cpp
index b1f32ae..15b48bf 100644
--- a/KTp/Models/kpeopletranslationproxy.cpp
+++ b/KTp/Models/kpeopletranslationproxy.cpp
@@ -91,8 +91,8 @@ QVariant KPeopleTranslationProxy::data(const QModelIndex &proxyIndex, int role)
             return contact.custom(QLatin1String("telepathy"), QLatin1String("contactId"));
 //         case KTp::HeaderTotalUsersRole:
 //             return sourceModel()->rowCount(mapToSource(proxyIndex));
-//         case KTp::ContactGroupsRole:
-//             return mapToSource(proxyIndex).data(PersonsModel::GroupsRole);
+        case KTp::ContactGroupsRole:
+            return mapToSource(proxyIndex).data(PersonsModel::GroupsRole);
 //         case KTp::NepomukUriRole:
 //             return mapToSource(proxyIndex).data(PersonsModel::UriRole);
     }
diff --git a/KTp/im-persons-data-source.cpp b/KTp/im-persons-data-source.cpp
index 6903597..fb1a0bc 100644
--- a/KTp/im-persons-data-source.cpp
+++ b/KTp/im-persons-data-source.cpp
@@ -148,6 +148,7 @@ KABC::Addressee KTpAllContacts::contactToAddressee(const QString &contactId) con
     Tp::AccountPtr account = KTp::contactManager()->accountForContact(contact);
     if (contact && account) {
         vcard.setFormattedName(contact->alias());
+        vcard.setCategories(contact->groups());
         vcard.insertCustom(QLatin1String("telepathy"), QLatin1String("contactId"), contact->id());
         vcard.insertCustom(QLatin1String("telepathy"), QLatin1String("accountPath"), account->objectPath());
         vcard.insertCustom(QLatin1String("telepathy"), QLatin1String("presence"), contact->presence().status());

-- 
ktp-common-internals packaging