[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=3436ea8

The following commit has been merged in the master branch:
commit 3436ea83800c64400b951961226e74c8eac56079
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Wed Mar 10 11:09:52 2010 +0000

    Fix checking if account contacts are buddies of is actually one of our own accounts.
    
    svn path=/trunk/playground/network/telepathy-contactlist/; revision=1101626
---
 contacts-list-model.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/contacts-list-model.cpp b/contacts-list-model.cpp
index 3601ab5..65dd5ec 100644
--- a/contacts-list-model.cpp
+++ b/contacts-list-model.cpp
@@ -46,16 +46,15 @@ ContactsListModel::ContactsListModel(QObject *parent)
     kDebug();
 
     // FIXME: Get the Nepomuk Resource for myself in the standardised way, once it is standardised.
-    Nepomuk::Resource me("nepomuk://myself");
+    Nepomuk::Resource me(QUrl::fromEncoded("nepomuk:/myself"));
 
-    // FIXME: Make it check if the found PersonContacts are grounding occurrences of me.
-    QString query = QString("select distinct ?a ?b where { ?a a %1 . ?a %2 ?b . ?b a %3 . ?b %4 ?r . ?r a %3 . ?s %2 ?r . ?s a %1 . }") // %5 %6 ?s }")
+    QString query = QString("select distinct ?a ?b where { ?a a %1 . ?a %2 ?b . ?b a %3 . ?b %4 ?r . ?r a %3 . ?s %2 ?r . ?s a %1 . %5 %6 ?s }")
             .arg(Soprano::Node::resourceToN3(Nepomuk::Vocabulary::NCO::PersonContact()))
             .arg(Soprano::Node::resourceToN3(Nepomuk::Vocabulary::NCO::hasIMAccount()))
             .arg(Soprano::Node::resourceToN3(Nepomuk::Vocabulary::NCO::IMAccount()))
-            .arg(Soprano::Node::resourceToN3(Nepomuk::Vocabulary::Telepathy::isBuddyOf()));
-//            .arg(Soprano::Node::resourceToN3(me.resourceUri()))
-//            .arg(Soprano::Node::resourceToN3(Nepomuk::Vocabulary::PIMO::groundingOccurrence()));
+            .arg(Soprano::Node::resourceToN3(Nepomuk::Vocabulary::Telepathy::isBuddyOf()))
+            .arg(Soprano::Node::resourceToN3(me.resourceUri()))
+            .arg(Soprano::Node::resourceToN3(Nepomuk::Vocabulary::PIMO::groundingOccurrence()));
 
     Soprano::Model *model = Nepomuk::ResourceManager::instance()->mainModel();
 

-- 
ktp-contact-list packaging