[tracker/im] NCO: Merge nco:IMContact properties into nco:IMAddress

[Jürg Billeter <juergbi src gnome org>]

commit ec8a9742c9afacf6d89888e1c8cdaea3fd365153
Author: Jürg Billeter <j bitron ch>
Date:   Wed Feb 3 12:11:50 2010 +0100

    NCO: Merge nco:IMContact properties into nco:IMAddress
    
    Special nco:PersonContact subclass should no longer be necessary with
    nco:hasIMContact.

 data/ontologies/32-nco.ontology |   19 +++++++------------
 1 files changed, 7 insertions(+), 12 deletions(-)
---
diff --git a/data/ontologies/32-nco.ontology b/data/ontologies/32-nco.ontology
index 0e036cb..b7814e8 100644
--- a/data/ontologies/32-nco.ontology
+++ b/data/ontologies/32-nco.ontology
@@ -66,16 +66,11 @@ nco:PersonContact a rdfs:Class ;
 
 nco:default-contact-me a nco:PersonContact.
 
-nco:IMContact a rdfs:Class ;
-	rdfs:label "IM Contact" ;
-	rdfs:comment "Contact coming from an IM Account" ;
-	rdfs:subClassOf nco:PersonContact .
-
 nco:IMAccount a rdfs:Class ;
 	rdfs:label "IMAccount" ;
 	rdfs:comment "An account in an Instant Messaging system. Only user 'me' can have IM Accounts (check hasIMAccount). All other contacts in the address book can come from one (check nco:fromIMAccount). The properties in this class (id, status,...) refers only to 'me'. The specific details of contacts coming from that account are properties of IMContact." ;
 	tracker:notify true ;
-	rdfs:subClassOf nco:IMContact .
+	rdfs:subClassOf nie:InformationElement .
 
 nco:MetaContact a rdfs:Class ;
         rdfs:label "MetaContact" ;
@@ -307,7 +302,7 @@ nco:hasIMContact a rdf:Property ;
 	rdfs:label "hasIMAccount" ;
 	rdfs:comment "Indicates that an Instant Messaging account owned by an entity represented by this contact." ;
 	rdfs:domain nco:IMAccount ;
-	rdfs:range nco:IMContact .
+	rdfs:range nco:IMAddress .
 
 # FIXME Range geo:Point but we dont have that class
 nco:hasLocation a rdf:Property ;
@@ -574,7 +569,7 @@ nco:imNickname a rdf:Property ;
 	rdfs:label "imNickname" ;
 	rdfs:comment "A nickname attached to a particular IM Account." ;
 	nrl:maxCardinality 1 ;
-	rdfs:domain nco:IMContact ;
+	rdfs:domain nco:IMAddress ;
 	rdfs:range xsd:string ;
 	tracker:fulltextIndexed true ;
 	tracker:weight 5 .
@@ -639,7 +634,7 @@ nco:imStatusMessage a rdf:Property ;
 	rdfs:label "imStatusMessage" ;
 	rdfs:comment "A feature common in most IM systems. A message left by the user for all his/her contacts to see." ;
 	nrl:maxCardinality 1 ;
-	rdfs:domain nco:IMContact ;
+	rdfs:domain nco:IMAddress ;
 	rdfs:range xsd:string .
 
 nco:imDisplayName a rdf:Property ;
@@ -698,7 +693,7 @@ nco:presence-status-error a nco:PresenceStatus .
 nco:imPresence a rdf:Property ;
 	rdfs:label "imPresence" ;
 	nrl:maxCardinality 1 ;
-	rdfs:domain nco:IMContact ;
+	rdfs:domain nco:IMAddress ;
 	rdfs:range nco:PresenceStatus .
 
 
@@ -717,10 +712,10 @@ nco:im-capability-stream-tubes a nco:IMCapability .
 nco:im-capability-dbus-tubes a nco:IMCapability .
 
 
-nco:imContactCapability a rdf:Property ;
+nco:imCapability a rdf:Property ;
 	rdfs:label "imContact Capability";
 	rdfs:comment "Capabilities of an IM Contact, what can we interact with him";
-	rdfs:domain nco:IMContact ;
+	rdfs:domain nco:IMAddress ;
 	rdfs:range nco:IMCapability .
 
 nco:hasIMAddress a rdf:Property ;