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

The following commit has been merged in the master branch:
commit d3cf3c3773ece8f643fbac0d35e6c3cb3bd07e61
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Mon Jan 2 18:46:13 2012 +0100

    Set contact alias as nao:prefLabel of pimo:Person if that particular person has no prefLabel yet
---
 kpeople/nepomuk-feeder/nepomuk-storage.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/kpeople/nepomuk-feeder/nepomuk-storage.cpp b/kpeople/nepomuk-feeder/nepomuk-storage.cpp
index df9fe11..52cc8e6 100644
--- a/kpeople/nepomuk-feeder/nepomuk-storage.cpp
+++ b/kpeople/nepomuk-feeder/nepomuk-storage.cpp
@@ -59,6 +59,7 @@
 
 #include <TelepathyQt/Constants>
 #include <TelepathyQt/AvatarData>
+#include <Soprano/Vocabulary/NAO>
 
 using namespace Nepomuk::Vocabulary;
 
@@ -818,6 +819,16 @@ void NepomukStorage::setContactAlias(const QString &path, const QString &id, con
     if( job->error() ) {
         kWarning() << job->errorString();
     }
+
+    if (!Nepomuk::Resource(resources.person()).hasProperty(Soprano::Vocabulary::NAO::prefLabel())) {
+        KJob *job = Nepomuk::setProperty( QList<QUrl>() << resources.person(), Soprano::Vocabulary::NAO::prefLabel(),
+                                          QVariantList() << alias );
+
+        job->exec();
+        if( job->error() ) {
+            kWarning() << job->errorString();
+        }
+    }
 }
 
 void NepomukStorage::setContactPresence(const QString &path,

-- 
ktp-common-internals packaging