[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=4fd0e28

The following commit has been merged in the master branch:
commit 4fd0e28df1cdd48bbf760bb02b8529712e54d250
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Nov 15 00:52:05 2013 +0100

    Insert account object path in contact fed data
---
 KTp/im-persons-data-source.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/KTp/im-persons-data-source.cpp b/KTp/im-persons-data-source.cpp
index 765adc5..ce7d5a0 100644
--- a/KTp/im-persons-data-source.cpp
+++ b/KTp/im-persons-data-source.cpp
@@ -149,14 +149,13 @@ KABC::Addressee::Map KTpAllContacts::contacts()
 KABC::Addressee KTpAllContacts::contactToAddressee(const QString &contactId) const
 {
     KABC::Addressee vcard;
-
-    qDebug() << "running ktp datasource" << contactId;
     KTp::ContactPtr contact = m_contacts[contactId];
-    if (contact) {
+    Tp::AccountPtr account = m_contactManager->accountForContact(contact);
+    if (contact && account) {
         vcard.setFormattedName(contact->alias());
         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());
-        //         vcard.insertCustom("telepathy", "accountId", contact->id());
         vcard.setPhoto(KABC::Picture(contact->avatarData().fileName));
     }
     return vcard;

-- 
ktp-common-internals packaging