[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=3839c62

The following commit has been merged in the master branch:
commit 3839c6216c9b361fd91f4dee3cefcb30970ba46d
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Thu Feb 11 22:32:23 2010 +0000

    Add support to the Telepathy ontology for the presence.type property of Telepathy current presence, and store this to Nepomuk for our accounts.
    
    svn path=/trunk/playground/network/telepathy-integration-daemon/; revision=1088922
---
 kpeople/nepomuk-feeder/telepathy.trig       | 7 +++++++
 kpeople/nepomuk-feeder/telepathyaccount.cpp | 7 ++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/kpeople/nepomuk-feeder/telepathy.trig b/kpeople/nepomuk-feeder/telepathy.trig
index af01110..20f876a 100644
--- a/kpeople/nepomuk-feeder/telepathy.trig
+++ b/kpeople/nepomuk-feeder/telepathy.trig
@@ -13,6 +13,13 @@ telepathy: {telepathy:accountIdentifier
           rdfs:domain nco:IMAccount ;
           rdfs:label "accountIdentifier" ;
           rdfs:range xsd:string .
+
+            telepathy:statusType
+     a rdf:Property ;
+          rdfs:comment "The current presence type as defined by the Telepathy Spec. Invalid values (by the Telepathy spec) should be considered as 0, Unset.";
+          rdfs:domain nco:IMAccount ;
+          rdfs:label "statusType" ;
+          rdfs:range xsd:integer .
 }
 
 <http://nepomuk.kde.org/ontologies/2009/06/20/telepathy/metadata>
diff --git a/kpeople/nepomuk-feeder/telepathyaccount.cpp b/kpeople/nepomuk-feeder/telepathyaccount.cpp
index 92c2b99..7fd7f3c 100644
--- a/kpeople/nepomuk-feeder/telepathyaccount.cpp
+++ b/kpeople/nepomuk-feeder/telepathyaccount.cpp
@@ -155,6 +155,8 @@ void TelepathyAccount::doNepomukSetup()
                                       m_account->currentPresence().status);
         m_accountResource.addProperty(Nepomuk::Vocabulary::NCO::imStatusMessage(),
                                       m_account->currentPresence().statusMessage);
+        m_accountResource.addProperty(Nepomuk::Vocabulary::Telepathy::statusType(),
+                                      m_account->currentPresence().type);
         m_accountResource.addProperty(Nepomuk::Vocabulary::Telepathy::accountIdentifier(),
                                       m_path);
 
@@ -215,9 +217,8 @@ void TelepathyAccount::onCurrentPresenceChanged(Tp::SimplePresence presence)
                                   presence.status);
     m_accountResource.setProperty(Nepomuk::Vocabulary::NCO::imStatusMessage(),
                                   presence.statusMessage);
-    // TODO: Add a Telepathy-specific property (in telepathy.trig) to represent the presence.type.
-    // TODO: When doing the above, also addProperty that property in doNepomukSetup() for newly
-    // created IMAccount resources.
+    m_accountResource.setProperty(Nepomuk::Vocabulary::Telepathy::statusType(),
+                                  presence.type);
 }
 
 

-- 
ktp-common-internals packaging