[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=35d9678

The following commit has been merged in the master branch:
commit 35d9678df1193e758b0f5744ee4232ffd77ad99e
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Sep 22 14:12:33 2013 +0100

    Set nco:ContactUid on new contacts. It is compromised on the account ID and the contact ID
    
    i.e gabble/davidedmundson at gmail.com_foo@example.com
    
    REVIEW: 112729
---
 kpeople/nepomuk-feeder/nepomuk-storage.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kpeople/nepomuk-feeder/nepomuk-storage.cpp b/kpeople/nepomuk-feeder/nepomuk-storage.cpp
index 37056d4..2742cf5 100644
--- a/kpeople/nepomuk-feeder/nepomuk-storage.cpp
+++ b/kpeople/nepomuk-feeder/nepomuk-storage.cpp
@@ -604,6 +604,8 @@ void NepomukStorage::createContact(const QString &path, const Tp::ContactPtr &co
     newImAccount.setProperty(NCO::imAccountType(), accountRes.protocol());
     newImAccount.addProperty(NCO::isAccessedBy(), accountUri);
 
+    newPersonContact.setProperty(NCO::contactUID(), path + QLatin1Char('_') + contact->id());
+    
     newPersonContact.addProperty(NCO::hasIMAccount(), newImAccount);
     updateAlias(newPersonContact, newImAccount, contact->alias());
     updateContactGroups(newPersonContact, contact->groups());

-- 
ktp-common-internals packaging