Merge lp:~rainct/libzeitgeist/update-ontology-feb2012 into lp:libzeitgeist

[Siegfried Gevatter]

[Mikkel Kamstrup Erlandsen (kamstrup)]

Looks good, but can you attach a bug and target it to 0.3.14?

review: Needs Fixing

[Mikkel Kamstrup Erlandsen (kamstrup)]

Great!

review: Approve

=== modified file 'src/zeitgeist-mimetypes.c'
--- src/zeitgeist-mimetypes.c	2012-01-25 13:01:17 +0000
+++ src/zeitgeist-mimetypes.c	2012-02-02 12:43:21 +0000
@@ -310,6 +310,7 @@
   zeitgeist_register_mimetype ("text/x-chdr", ZEITGEIST_NFO_SOURCE_CODE);
   zeitgeist_register_mimetype ("application/x-gzip", ZEITGEIST_NFO_ARCHIVE);
   zeitgeist_register_mimetype ("application/x-dia-diagram", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("image/vnd.djvu", ZEITGEIST_NFO_PAGINATED_TEXT_DOCUMENT);
   zeitgeist_register_mimetype ("application/x-csh", ZEITGEIST_NFO_SOURCE_CODE);
   zeitgeist_register_mimetype ("text/css", ZEITGEIST_NFO_SOURCE_CODE);
   zeitgeist_register_mimetype ("text/x-csharp", ZEITGEIST_NFO_SOURCE_CODE);
@@ -325,6 +326,7 @@
   zeitgeist_register_mimetype ("application/vnd.ms-excel", ZEITGEIST_NFO_SPREADSHEET);
   zeitgeist_register_mimetype ("text/x-dsrc", ZEITGEIST_NFO_SOURCE_CODE);
   zeitgeist_register_mimetype ("text/x-haskell", ZEITGEIST_NFO_SOURCE_CODE);
+  zeitgeist_register_mimetype ("inode/directory", ZEITGEIST_NFO_FOLDER);
   zeitgeist_register_mimetype ("application/x-object", ZEITGEIST_NFO_SOURCE_CODE);
   zeitgeist_register_mimetype ("text/x-c", ZEITGEIST_NFO_SOURCE_CODE);
   zeitgeist_register_mimetype ("application/x-ruby", ZEITGEIST_NFO_SOURCE_CODE);
@@ -335,7 +337,6 @@
   zeitgeist_register_mimetype ("text/x-m4", ZEITGEIST_NFO_SOURCE_CODE);
   zeitgeist_register_mimetype ("text/x-tcl", ZEITGEIST_NFO_SOURCE_CODE);
   zeitgeist_register_mimetype ("application/ecmascript", ZEITGEIST_NFO_SOURCE_CODE);
-  zeitgeist_register_mimetype ("inode/directory", ZEITGEIST_NFO_FOLDER);
   zeitgeist_register_mimetype ("application/msword", ZEITGEIST_NFO_PAGINATED_TEXT_DOCUMENT);
   zeitgeist_register_mimetype_regex ("application/vnd.oasis.opendocument.text.*", ZEITGEIST_NFO_PAGINATED_TEXT_DOCUMENT);
   zeitgeist_register_mimetype_regex ("application/vnd.oasis.opendocument.presentation.*", ZEITGEIST_NFO_PRESENTATION);

=== modified file 'src/zeitgeist-ontology-interpretations.h'
--- src/zeitgeist-ontology-interpretations.h	2011-03-07 14:19:39 +0000
+++ src/zeitgeist-ontology-interpretations.h	2012-02-02 12:43:21 +0000
@@ -129,6 +129,71 @@
 #define ZEITGEIST_NCAL_TODO "http://www.semanticdesktop.org/ontologies/2007/04/02/ncal#Todo"
 
 /**
+ * ZEITGEIST_NCO_CONTACT:
+ *
+ * Macro defining the interpretation type <ulink url="http://www.semanticdesktop.org/ontologies/2007/03/22/nco#Contact">http://www.semanticdesktop.org/ontologies/2007/03/22/nco&num;Contact</ulink>
+ *
+ *	A Contact. A piece of data that can provide means to identify or communicate with an entity.
+ *
+ * Children: #ZEITGEIST_NCO_PERSON_CONTACT, #ZEITGEIST_NCO_ORGANIZATION_CONTACT
+ *
+ * Parents: None
+ */
+#define ZEITGEIST_NCO_CONTACT "http://www.semanticdesktop.org/ontologies/2007/03/22/nco#Contact"
+
+/**
+ * ZEITGEIST_NCO_CONTACT_GROUP:
+ *
+ * Macro defining the interpretation type <ulink url="http://www.semanticdesktop.org/ontologies/2007/03/22/nco#ContactGroup">http://www.semanticdesktop.org/ontologies/2007/03/22/nco&num;ContactGroup</ulink>
+ *
+ *	A group of Contacts. Could be used to express a group in an addressbook or on a contact list of an IM application. One contact can belong to many groups.
+ *
+ * Children: None
+ *
+ * Parents: None
+ */
+#define ZEITGEIST_NCO_CONTACT_GROUP "http://www.semanticdesktop.org/ontologies/2007/03/22/nco#ContactGroup"
+
+/**
+ * ZEITGEIST_NCO_CONTACT_LIST:
+ *
+ * Macro defining the interpretation type <ulink url="http://www.semanticdesktop.org/ontologies/2007/03/22/nco#ContactList">http://www.semanticdesktop.org/ontologies/2007/03/22/nco&num;ContactList</ulink>
+ *
+ *	A contact list, this class represents an addressbook or a contact list of an IM application. Contacts inside a contact list can belong to contact groups.
+ *
+ * Children: None
+ *
+ * Parents: None
+ */
+#define ZEITGEIST_NCO_CONTACT_LIST "http://www.semanticdesktop.org/ontologies/2007/03/22/nco#ContactList"
+
+/**
+ * ZEITGEIST_NCO_ORGANIZATION_CONTACT:
+ *
+ * Macro defining the interpretation type <ulink url="http://www.semanticdesktop.org/ontologies/2007/03/22/nco#OrganizationContact">http://www.semanticdesktop.org/ontologies/2007/03/22/nco&num;OrganizationContact</ulink>
+ *
+ *	A Contact that denotes on Organization.
+ *
+ * Children: None
+ *
+ * Parents: #ZEITGEIST_NCO_CONTACT
+ */
+#define ZEITGEIST_NCO_ORGANIZATION_CONTACT "http://www.semanticdesktop.org/ontologies/2007/03/22/nco#OrganizationContact"
+
+/**
+ * ZEITGEIST_NCO_PERSON_CONTACT:
+ *
+ * Macro defining the interpretation type <ulink url="http://www.semanticdesktop.org/ontologies/2007/03/22/nco#PersonContact">http://www.semanticdesktop.org/ontologies/2007/03/22/nco&num;PersonContact</ulink>
+ *
+ *	A Contact that denotes a Person. A person can have multiple Affiliations.
+ *
+ * Children: None
+ *
+ * Parents: #ZEITGEIST_NCO_CONTACT
+ */
+#define ZEITGEIST_NCO_PERSON_CONTACT "http://www.semanticdesktop.org/ontologies/2007/03/22/nco#PersonContact"
+
+/**
  * ZEITGEIST_NFO_APPLICATION:
  *
  * Macro defining the interpretation type <ulink url="http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Application">http://www.semanticdesktop.org/ontologies/2007/03/22/nfo&num;Application</ulink>
@@ -161,7 +226,7 @@
  *
  *	A file containing audio content.
  *
- * Children: None
+ * Children: #ZEITGEIST_NMM_MUSIC_PIECE
  *
  * Parents: #ZEITGEIST_NFO_MEDIA
  */
@@ -250,7 +315,7 @@
  *
  * Macro defining the interpretation type <ulink url="http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Filesystem">http://www.semanticdesktop.org/ontologies/2007/03/22/nfo&num;Filesystem</ulink>
  *
- *	A filesystem. Examples of filesystems include hard disk partitions, removable media, but also images thereof stored in files.
+ *	A filesystem. Examples of filesystems include hard disk partitions, removable media, but also images thereof stored in files such as ISO.
  *
  * Children: #ZEITGEIST_NFO_FILESYSTEM_IMAGE
  *
@@ -263,7 +328,7 @@
  *
  * Macro defining the interpretation type <ulink url="http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#FilesystemImage">http://www.semanticdesktop.org/ontologies/2007/03/22/nfo&num;FilesystemImage</ulink>
  *
- *	An image of a filesystem. Instances of this class may include CD images, DVD images or hard disk partition images created by various pieces of software (e.g. Norton Ghost).
+ *	An image of a filesystem. Instances of this class may include CD images, DVD images or hard disk partition images created by various pieces of software (e.g. Norton Ghost). Deprecated in favor of nfo:Filesystem.
  *
  * Children: None
  *
@@ -343,7 +408,7 @@
  *
  *	A piece of media content. This class may be used to express complex media containers with many streams of various media content (both aural and visual).
  *
- * Children: #ZEITGEIST_NFO_VISUAL, #ZEITGEIST_NFO_AUDIO, #ZEITGEIST_NMM_MUSIC_PIECE
+ * Children: #ZEITGEIST_NFO_VISUAL, #ZEITGEIST_NFO_AUDIO
  *
  * Parents: None
  */
@@ -592,7 +657,7 @@
  *
  * Children: None
  *
- * Parents: #ZEITGEIST_NFO_MEDIA
+ * Parents: #ZEITGEIST_NFO_AUDIO
  */
 #define ZEITGEIST_NMM_MUSIC_PIECE "http://www.semanticdesktop.org/ontologies/2009/02/19/nmm#MusicPiece"
 
@@ -688,6 +753,19 @@
 #define ZEITGEIST_NMO_MIME_ENTITY "http://www.semanticdesktop.org/ontologies/2007/03/22/nmo#MimeEntity"
 
 /**
+ * ZEITGEIST_ZG_ACCEPT_EVENT:
+ *
+ * Macro defining the interpretation type <ulink url="http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#AcceptEvent">http://www.zeitgeist-project.com/ontologies/2010/01/27/zg&num;AcceptEvent</ulink>
+ *
+ *	Event triggered when the user accepts a request of some sort. Examples could be answering a phone call, accepting a file transfer, or accepting a friendship request over an IM protocol. See also DenyEvent for when the user denies a similar request.
+ *
+ * Children: None
+ *
+ * Parents: #ZEITGEIST_ZG_EVENT_INTERPRETATION
+ */
+#define ZEITGEIST_ZG_ACCEPT_EVENT "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#AcceptEvent"
+
+/**
  * ZEITGEIST_ZG_ACCESS_EVENT:
  *
  * Macro defining the interpretation type <ulink url="http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#AccessEvent">http://www.zeitgeist-project.com/ontologies/2010/01/27/zg&num;AccessEvent</ulink>
@@ -727,19 +805,45 @@
 #define ZEITGEIST_ZG_DELETE_EVENT "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#DeleteEvent"
 
 /**
+ * ZEITGEIST_ZG_DENY_EVENT:
+ *
+ * Macro defining the interpretation type <ulink url="http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#DenyEvent">http://www.zeitgeist-project.com/ontologies/2010/01/27/zg&num;DenyEvent</ulink>
+ *
+ *	Event triggered when the user denies a request of some sort. Examples could be rejecting a phone call, rejecting a file transfer, or denying a friendship request over an IM protocol. See also AcceptEvent for the converse event type.
+ *
+ * Children: None
+ *
+ * Parents: #ZEITGEIST_ZG_EVENT_INTERPRETATION
+ */
+#define ZEITGEIST_ZG_DENY_EVENT "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#DenyEvent"
+
+/**
  * ZEITGEIST_ZG_EVENT_INTERPRETATION:
  *
  * Macro defining the interpretation type <ulink url="http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#EventInterpretation">http://www.zeitgeist-project.com/ontologies/2010/01/27/zg&num;EventInterpretation</ulink>
  *
  *	Base class for event interpretations. Please do no instantiate directly, but use one of the sub classes. The interpretation of an event describes 'what happened' - fx. 'something was created' or 'something was accessed'.
  *
- * Children: #ZEITGEIST_ZG_LEAVE_EVENT, #ZEITGEIST_ZG_MODIFY_EVENT, #ZEITGEIST_ZG_CREATE_EVENT, #ZEITGEIST_ZG_SEND_EVENT, #ZEITGEIST_ZG_ACCESS_EVENT, #ZEITGEIST_ZG_DELETE_EVENT, #ZEITGEIST_ZG_RECEIVE_EVENT
+ * Children: #ZEITGEIST_ZG_DENY_EVENT, #ZEITGEIST_ZG_ACCESS_EVENT, #ZEITGEIST_ZG_EXPIRE_EVENT, #ZEITGEIST_ZG_LEAVE_EVENT, #ZEITGEIST_ZG_CREATE_EVENT, #ZEITGEIST_ZG_MOVE_EVENT, #ZEITGEIST_ZG_ACCEPT_EVENT, #ZEITGEIST_ZG_SEND_EVENT, #ZEITGEIST_ZG_MODIFY_EVENT, #ZEITGEIST_ZG_DELETE_EVENT, #ZEITGEIST_ZG_RECEIVE_EVENT
  *
  * Parents: None
  */
 #define ZEITGEIST_ZG_EVENT_INTERPRETATION "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#EventInterpretation"
 
 /**
+ * ZEITGEIST_ZG_EXPIRE_EVENT:
+ *
+ * Macro defining the interpretation type <ulink url="http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#ExpireEvent">http://www.zeitgeist-project.com/ontologies/2010/01/27/zg&num;ExpireEvent</ulink>
+ *
+ *	Event triggered when something expires or times out. These types of events are normally not triggered by the user, but by the operating system or some external party. Examples are a recurring calendar item or task deadline that expires or a when the user fails to respond to an external request such as a phone call.
+ *
+ * Children: None
+ *
+ * Parents: #ZEITGEIST_ZG_EVENT_INTERPRETATION
+ */
+#define ZEITGEIST_ZG_EXPIRE_EVENT "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#ExpireEvent"
+
+/**
  * ZEITGEIST_ZG_LEAVE_EVENT:
  *
  * Macro defining the interpretation type <ulink url="http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#LeaveEvent">http://www.zeitgeist-project.com/ontologies/2010/01/27/zg&num;LeaveEvent</ulink>
@@ -766,6 +870,19 @@
 #define ZEITGEIST_ZG_MODIFY_EVENT "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#ModifyEvent"
 
 /**
+ * ZEITGEIST_ZG_MOVE_EVENT:
+ *
+ * Macro defining the interpretation type <ulink url="http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#MoveEvent">http://www.zeitgeist-project.com/ontologies/2010/01/27/zg&num;MoveEvent</ulink>
+ *
+ *	Event triggered when a resource has been moved from a location to another. Fx. moving a file from a folder to another.
+ *
+ * Children: None
+ *
+ * Parents: #ZEITGEIST_ZG_EVENT_INTERPRETATION
+ */
+#define ZEITGEIST_ZG_MOVE_EVENT "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#MoveEvent"
+
+/**
  * ZEITGEIST_ZG_RECEIVE_EVENT:
  *
  * Macro defining the interpretation type <ulink url="http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#ReceiveEvent">http://www.zeitgeist-project.com/ontologies/2010/01/27/zg&num;ReceiveEvent</ulink>
@@ -792,7 +909,6 @@
 #define ZEITGEIST_ZG_SEND_EVENT "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#SendEvent"
 
 
-
 /* IMPORTANT: AUTO GENERATED CONTENT STOP */
 
 #endif /* _ZEITGEIST_ONTOLOGY_INTERPRETATIONS_H_ */

=== modified file 'src/zeitgeist-ontology-manifestations.h'
--- src/zeitgeist-ontology-manifestations.h	2011-03-07 14:19:39 +0000
+++ src/zeitgeist-ontology-manifestations.h	2012-02-02 12:43:21 +0000
@@ -59,11 +59,24 @@
  *
  * Children: None
  *
- * Parents: #MANIFESTATION
+ * Parents: None
  */
 #define ZEITGEIST_NCAL_CALENDAR_DATA_OBJECT "http://www.semanticdesktop.org/ontologies/2007/04/02/ncal#CalendarDataObject"
 
 /**
+ * ZEITGEIST_NCO_CONTACT_LIST_DATA_OBJECT:
+ *
+ * Macro defining the manifestation type <ulink url="http://www.semanticdesktop.org/ontologies/2007/03/22/nco#ContactListDataObject">http://www.semanticdesktop.org/ontologies/2007/03/22/nco&num;ContactListDataObject</ulink>
+ *
+ *	An entity occuring on a contact list (usually interpreted as an nco:Contact).
+ *
+ * Children: None
+ *
+ * Parents: None
+ */
+#define ZEITGEIST_NCO_CONTACT_LIST_DATA_OBJECT "http://www.semanticdesktop.org/ontologies/2007/03/22/nco#ContactListDataObject"
+
+/**
  * ZEITGEIST_NFO_ARCHIVE_ITEM:
  *
  * Macro defining the manifestation type <ulink url="http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#ArchiveItem">http://www.semanticdesktop.org/ontologies/2007/03/22/nfo&num;ArchiveItem</ulink>
@@ -124,7 +137,7 @@
  *
  * Children: #ZEITGEIST_NFO_EMBEDDED_FILE_DATA_OBJECT, #ZEITGEIST_NFO_DELETED_RESOURCE, #ZEITGEIST_NFO_REMOTE_DATA_OBJECT
  *
- * Parents: #MANIFESTATION
+ * Parents: None
  */
 #define ZEITGEIST_NFO_FILE_DATA_OBJECT "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#FileDataObject"
 
@@ -137,7 +150,7 @@
  *
  * Children: None
  *
- * Parents: #MANIFESTATION
+ * Parents: None
  */
 #define ZEITGEIST_NFO_HARD_DISK_PARTITION "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#HardDiskPartition"
 
@@ -150,7 +163,7 @@
  *
  * Children: None
  *
- * Parents: #MANIFESTATION
+ * Parents: None
  */
 #define ZEITGEIST_NFO_MEDIA_STREAM "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#MediaStream"
 
@@ -176,7 +189,7 @@
  *
  * Children: None
  *
- * Parents: #MANIFESTATION
+ * Parents: None
  */
 #define ZEITGEIST_NFO_REMOTE_PORT_ADDRESS "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#RemotePortAddress"
 
@@ -189,7 +202,7 @@
  *
  * Children: None
  *
- * Parents: #MANIFESTATION
+ * Parents: None
  */
 #define ZEITGEIST_NFO_SOFTWARE_ITEM "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#SoftwareItem"
 
@@ -198,15 +211,28 @@
  *
  * Macro defining the manifestation type <ulink url="http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#SoftwareService">http://www.semanticdesktop.org/ontologies/2007/03/22/nfo&num;SoftwareService</ulink>
  *
- *	A service published by a piece of software, either by an operating system or an application. Examples of such services may include calendar, addresbook and mailbox managed by a PIM application. This category is introduced to distinguish between data available directly from the applications (Via some Interprocess Communication Mechanisms) and data available from files on a disk. In either case both DataObjects would receive a similar interpretation (e.g. a Mailbox) and wouldn't differ on the content level.
+ *	A service published by a piece of software, either by an operating system or an application. Examples of such services may include calendar, addressbook and mailbox managed by a PIM application. This category is introduced to distinguish between data available directly from the applications (Via some Interprocess Communication Mechanisms) and data available from files on a disk. In either case both DataObjects would receive a similar interpretation (e.g. a Mailbox) and wouldn't differ on the content level.
  *
  * Children: None
  *
- * Parents: #MANIFESTATION
+ * Parents: None
  */
 #define ZEITGEIST_NFO_SOFTWARE_SERVICE "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#SoftwareService"
 
 /**
+ * ZEITGEIST_NFO_WEB_DATA_OBJECT:
+ *
+ * Macro defining the manifestation type <ulink url="http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#WebDataObject">http://www.semanticdesktop.org/ontologies/2007/03/22/nfo&num;WebDataObject</ulink>
+ *
+ *	An information resources of which representations (files, streams) can be retrieved through a web server. They may be generated at retrieval time. Typical examples are pages served by PHP or AJAX or mp3 streams.
+ *
+ * Children: None
+ *
+ * Parents: None
+ */
+#define ZEITGEIST_NFO_WEB_DATA_OBJECT "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#WebDataObject"
+
+/**
  * ZEITGEIST_NMO_MAILBOX_DATA_OBJECT:
  *
  * Macro defining the manifestation type <ulink url="http://www.semanticdesktop.org/ontologies/2007/03/22/nmo#MailboxDataObject">http://www.semanticdesktop.org/ontologies/2007/03/22/nmo&num;MailboxDataObject</ulink>
@@ -215,7 +241,7 @@
  *
  * Children: None
  *
- * Parents: #MANIFESTATION
+ * Parents: None
  */
 #define ZEITGEIST_NMO_MAILBOX_DATA_OBJECT "http://www.semanticdesktop.org/ontologies/2007/03/22/nmo#MailboxDataObject"
 
@@ -228,7 +254,7 @@
  *
  * Children: #ZEITGEIST_ZG_USER_ACTIVITY, #ZEITGEIST_ZG_SYSTEM_NOTIFICATION, #ZEITGEIST_ZG_HEURISTIC_ACTIVITY, #ZEITGEIST_ZG_SCHEDULED_ACTIVITY, #ZEITGEIST_ZG_WORLD_ACTIVITY
  *
- * Parents: #MANIFESTATION
+ * Parents: None
  */
 #define ZEITGEIST_ZG_EVENT_MANIFESTATION "http://www.zeitgeist-project.com/ontologies/2010/01/27/zg#EventManifestation"
 

=== modified file 'src/zeitgeist-symbols.c'
--- src/zeitgeist-symbols.c	2011-03-07 14:19:39 +0000
+++ src/zeitgeist-symbols.c	2012-02-02 12:43:21 +0000
@@ -92,7 +92,7 @@
  * 
  * Gets list of immediate parents of the specified symbol.
  *
- * Returns: A newly allocated list of immediate parents of this symbol. 
+ * Returns: A newly allocated list of immediate parents of this symbol.
  *          The data elements of the list contain strings which you
  *          do not own, use g_strdup() if you intend to work with them.
  *          Free the list with a call to g_list_free().
@@ -277,17 +277,14 @@
   g_free (children);
   g_free (all_children);
 
-  uri = ZEITGEIST_NMO_MESSAGE;
-  parents = g_new (char*, 1);
-  parents[0] = NULL;
-  children = g_new (char*, 3);
-  children[0] = ZEITGEIST_NMO_EMAIL;
-  children[1] = ZEITGEIST_NMO_IMMESSAGE;
-  children[2] = NULL;
-  all_children = g_new (char*, 3);
-  all_children[0] = ZEITGEIST_NMO_EMAIL;
-  all_children[1] = ZEITGEIST_NMO_IMMESSAGE;
-  all_children[2] = NULL;
+  uri = ZEITGEIST_NFO_CURSOR;
+  parents = g_new (char*, 2);
+  parents[0] = ZEITGEIST_NFO_RASTER_IMAGE;
+  parents[1] = NULL;
+  children = g_new (char*, 1);
+  children[0] = NULL;
+  all_children = g_new (char*, 1);
+  all_children[0] = NULL;
   info = symbol_info_new (uri, parents, children, all_children);
   zeitgeist_register_symbol (info);
   g_free (parents);
@@ -379,6 +376,20 @@
   g_free (children);
   g_free (all_children);
 
+  uri = ZEITGEIST_NCO_PERSON_CONTACT;
+  parents = g_new (char*, 2);
+  parents[0] = ZEITGEIST_NCO_CONTACT;
+  parents[1] = NULL;
+  children = g_new (char*, 1);
+  children[0] = NULL;
+  all_children = g_new (char*, 1);
+  all_children[0] = NULL;
+  info = symbol_info_new (uri, parents, children, all_children);
+  zeitgeist_register_symbol (info);
+  g_free (parents);
+  g_free (children);
+  g_free (all_children);
+
   uri = ZEITGEIST_NCAL_CALENDAR;
   parents = g_new (char*, 1);
   parents[0] = NULL;
@@ -392,27 +403,33 @@
   g_free (children);
   g_free (all_children);
 
-  uri = ZEITGEIST_NFO_BOOKMARK;
+  uri = ZEITGEIST_NCO_CONTACT;
   parents = g_new (char*, 1);
   parents[0] = NULL;
-  children = g_new (char*, 1);
-  children[0] = NULL;
-  all_children = g_new (char*, 1);
-  all_children[0] = NULL;
+  children = g_new (char*, 3);
+  children[0] = ZEITGEIST_NCO_PERSON_CONTACT;
+  children[1] = ZEITGEIST_NCO_ORGANIZATION_CONTACT;
+  children[2] = NULL;
+  all_children = g_new (char*, 3);
+  all_children[0] = ZEITGEIST_NCO_ORGANIZATION_CONTACT;
+  all_children[1] = ZEITGEIST_NCO_PERSON_CONTACT;
+  all_children[2] = NULL;
   info = symbol_info_new (uri, parents, children, all_children);
   zeitgeist_register_symbol (info);
   g_free (parents);
   g_free (children);
   g_free (all_children);
 
-  uri = ZEITGEIST_NMO_IMMESSAGE;
+  uri = ZEITGEIST_NFO_RASTER_IMAGE;
   parents = g_new (char*, 2);
-  parents[0] = ZEITGEIST_NMO_MESSAGE;
+  parents[0] = ZEITGEIST_NFO_IMAGE;
   parents[1] = NULL;
-  children = g_new (char*, 1);
-  children[0] = NULL;
-  all_children = g_new (char*, 1);
-  all_children[0] = NULL;
+  children = g_new (char*, 2);
+  children[0] = ZEITGEIST_NFO_CURSOR;
+  children[1] = NULL;
+  all_children = g_new (char*, 2);
+  all_children[0] = ZEITGEIST_NFO_CURSOR;
+  all_children[1] = NULL;
   info = symbol_info_new (uri, parents, children, all_children);
   zeitgeist_register_symbol (info);
   g_free (parents);
@@ -488,9 +505,23 @@
   g_free (children);
   g_free (all_children);
 
-  uri = ZEITGEIST_NFO_CURSOR;
-  parents = g_new (char*, 2);
-  parents[0] = ZEITGEIST_NFO_RASTER_IMAGE;
+  uri = ZEITGEIST_NMO_IMMESSAGE;
+  parents = g_new (char*, 2);
+  parents[0] = ZEITGEIST_NMO_MESSAGE;
+  parents[1] = NULL;
+  children = g_new (char*, 1);
+  children[0] = NULL;
+  all_children = g_new (char*, 1);
+  all_children[0] = NULL;
+  info = symbol_info_new (uri, parents, children, all_children);
+  zeitgeist_register_symbol (info);
+  g_free (parents);
+  g_free (children);
+  g_free (all_children);
+
+  uri = ZEITGEIST_NFO_HTML_DOCUMENT;
+  parents = g_new (char*, 2);
+  parents[0] = ZEITGEIST_NFO_PLAIN_TEXT_DOCUMENT;
   parents[1] = NULL;
   children = g_new (char*, 1);
   children[0] = NULL;
@@ -533,32 +564,41 @@
   g_free (children);
   g_free (all_children);
 
-  uri = ZEITGEIST_NFO_HTML_DOCUMENT;
-  parents = g_new (char*, 2);
-  parents[0] = ZEITGEIST_NFO_PLAIN_TEXT_DOCUMENT;
-  parents[1] = NULL;
-  children = g_new (char*, 1);
-  children[0] = NULL;
-  all_children = g_new (char*, 1);
-  all_children[0] = NULL;
-  info = symbol_info_new (uri, parents, children, all_children);
-  zeitgeist_register_symbol (info);
-  g_free (parents);
-  g_free (children);
-  g_free (all_children);
-
-  uri = ZEITGEIST_NFO_PLAIN_TEXT_DOCUMENT;
-  parents = g_new (char*, 2);
-  parents[0] = ZEITGEIST_NFO_TEXT_DOCUMENT;
-  parents[1] = NULL;
-  children = g_new (char*, 3);
-  children[0] = ZEITGEIST_NFO_SOURCE_CODE;
-  children[1] = ZEITGEIST_NFO_HTML_DOCUMENT;
-  children[2] = NULL;
-  all_children = g_new (char*, 3);
-  all_children[0] = ZEITGEIST_NFO_SOURCE_CODE;
-  all_children[1] = ZEITGEIST_NFO_HTML_DOCUMENT;
-  all_children[2] = NULL;
+  uri = ZEITGEIST_ZG_ACCEPT_EVENT;
+  parents = g_new (char*, 2);
+  parents[0] = ZEITGEIST_ZG_EVENT_INTERPRETATION;
+  parents[1] = NULL;
+  children = g_new (char*, 1);
+  children[0] = NULL;
+  all_children = g_new (char*, 1);
+  all_children[0] = NULL;
+  info = symbol_info_new (uri, parents, children, all_children);
+  zeitgeist_register_symbol (info);
+  g_free (parents);
+  g_free (children);
+  g_free (all_children);
+
+  uri = ZEITGEIST_NFO_BOOKMARK;
+  parents = g_new (char*, 1);
+  parents[0] = NULL;
+  children = g_new (char*, 1);
+  children[0] = NULL;
+  all_children = g_new (char*, 1);
+  all_children[0] = NULL;
+  info = symbol_info_new (uri, parents, children, all_children);
+  zeitgeist_register_symbol (info);
+  g_free (parents);
+  g_free (children);
+  g_free (all_children);
+
+  uri = ZEITGEIST_ZG_EXPIRE_EVENT;
+  parents = g_new (char*, 2);
+  parents[0] = ZEITGEIST_ZG_EVENT_INTERPRETATION;
+  parents[1] = NULL;
+  children = g_new (char*, 1);
+  children[0] = NULL;
+  all_children = g_new (char*, 1);
+  all_children[0] = NULL;
   info = symbol_info_new (uri, parents, children, all_children);
   zeitgeist_register_symbol (info);
   g_free (parents);
@@ -600,22 +640,6 @@
   g_free (children);
   g_free (all_children);
 
-  uri = ZEITGEIST_NFO_RASTER_IMAGE;
-  parents = g_new (char*, 2);
-  parents[0] = ZEITGEIST_NFO_IMAGE;
-  parents[1] = NULL;
-  children = g_new (char*, 2);
-  children[0] = ZEITGEIST_NFO_CURSOR;
-  children[1] = NULL;
-  all_children = g_new (char*, 2);
-  all_children[0] = ZEITGEIST_NFO_CURSOR;
-  all_children[1] = NULL;
-  info = symbol_info_new (uri, parents, children, all_children);
-  zeitgeist_register_symbol (info);
-  g_free (parents);
-  g_free (children);
-  g_free (all_children);
-
   uri = ZEITGEIST_NFO_IMAGE;
   parents = g_new (char*, 2);
   parents[0] = ZEITGEIST_NFO_VISUAL;
@@ -637,27 +661,53 @@
   g_free (children);
   g_free (all_children);
 
+  uri = ZEITGEIST_NFO_PLAIN_TEXT_DOCUMENT;
+  parents = g_new (char*, 2);
+  parents[0] = ZEITGEIST_NFO_TEXT_DOCUMENT;
+  parents[1] = NULL;
+  children = g_new (char*, 3);
+  children[0] = ZEITGEIST_NFO_SOURCE_CODE;
+  children[1] = ZEITGEIST_NFO_HTML_DOCUMENT;
+  children[2] = NULL;
+  all_children = g_new (char*, 3);
+  all_children[0] = ZEITGEIST_NFO_SOURCE_CODE;
+  all_children[1] = ZEITGEIST_NFO_HTML_DOCUMENT;
+  all_children[2] = NULL;
+  info = symbol_info_new (uri, parents, children, all_children);
+  zeitgeist_register_symbol (info);
+  g_free (parents);
+  g_free (children);
+  g_free (all_children);
+
   uri = ZEITGEIST_ZG_EVENT_INTERPRETATION;
   parents = g_new (char*, 1);
   parents[0] = NULL;
-  children = g_new (char*, 8);
-  children[0] = ZEITGEIST_ZG_LEAVE_EVENT;
-  children[1] = ZEITGEIST_ZG_MODIFY_EVENT;
-  children[2] = ZEITGEIST_ZG_CREATE_EVENT;
-  children[3] = ZEITGEIST_ZG_SEND_EVENT;
-  children[4] = ZEITGEIST_ZG_ACCESS_EVENT;
-  children[5] = ZEITGEIST_ZG_DELETE_EVENT;
-  children[6] = ZEITGEIST_ZG_RECEIVE_EVENT;
-  children[7] = NULL;
-  all_children = g_new (char*, 8);
-  all_children[0] = ZEITGEIST_ZG_LEAVE_EVENT;
+  children = g_new (char*, 12);
+  children[0] = ZEITGEIST_ZG_DENY_EVENT;
+  children[1] = ZEITGEIST_ZG_ACCESS_EVENT;
+  children[2] = ZEITGEIST_ZG_EXPIRE_EVENT;
+  children[3] = ZEITGEIST_ZG_LEAVE_EVENT;
+  children[4] = ZEITGEIST_ZG_CREATE_EVENT;
+  children[5] = ZEITGEIST_ZG_MOVE_EVENT;
+  children[6] = ZEITGEIST_ZG_ACCEPT_EVENT;
+  children[7] = ZEITGEIST_ZG_SEND_EVENT;
+  children[8] = ZEITGEIST_ZG_MODIFY_EVENT;
+  children[9] = ZEITGEIST_ZG_DELETE_EVENT;
+  children[10] = ZEITGEIST_ZG_RECEIVE_EVENT;
+  children[11] = NULL;
+  all_children = g_new (char*, 12);
+  all_children[0] = ZEITGEIST_ZG_DENY_EVENT;
   all_children[1] = ZEITGEIST_ZG_MODIFY_EVENT;
-  all_children[2] = ZEITGEIST_ZG_CREATE_EVENT;
-  all_children[3] = ZEITGEIST_ZG_SEND_EVENT;
-  all_children[4] = ZEITGEIST_ZG_ACCESS_EVENT;
-  all_children[5] = ZEITGEIST_ZG_DELETE_EVENT;
-  all_children[6] = ZEITGEIST_ZG_RECEIVE_EVENT;
-  all_children[7] = NULL;
+  all_children[2] = ZEITGEIST_ZG_EXPIRE_EVENT;
+  all_children[3] = ZEITGEIST_ZG_LEAVE_EVENT;
+  all_children[4] = ZEITGEIST_ZG_CREATE_EVENT;
+  all_children[5] = ZEITGEIST_ZG_MOVE_EVENT;
+  all_children[6] = ZEITGEIST_ZG_ACCEPT_EVENT;
+  all_children[7] = ZEITGEIST_ZG_SEND_EVENT;
+  all_children[8] = ZEITGEIST_ZG_ACCESS_EVENT;
+  all_children[9] = ZEITGEIST_ZG_DELETE_EVENT;
+  all_children[10] = ZEITGEIST_ZG_RECEIVE_EVENT;
+  all_children[11] = NULL;
   info = symbol_info_new (uri, parents, children, all_children);
   zeitgeist_register_symbol (info);
   g_free (parents);
@@ -719,7 +769,7 @@
 
   uri = ZEITGEIST_NMM_MUSIC_PIECE;
   parents = g_new (char*, 2);
-  parents[0] = ZEITGEIST_NFO_MEDIA;
+  parents[0] = ZEITGEIST_NFO_AUDIO;
   parents[1] = NULL;
   children = g_new (char*, 1);
   children[0] = NULL;
@@ -744,6 +794,20 @@
   g_free (children);
   g_free (all_children);
 
+  uri = ZEITGEIST_ZG_DENY_EVENT;
+  parents = g_new (char*, 2);
+  parents[0] = ZEITGEIST_ZG_EVENT_INTERPRETATION;
+  parents[1] = NULL;
+  children = g_new (char*, 1);
+  children[0] = NULL;
+  all_children = g_new (char*, 1);
+  all_children[0] = NULL;
+  info = symbol_info_new (uri, parents, children, all_children);
+  zeitgeist_register_symbol (info);
+  g_free (parents);
+  g_free (children);
+  g_free (all_children);
+
   uri = ZEITGEIST_NFO_TEXT_DOCUMENT;
   parents = g_new (char*, 2);
   parents[0] = ZEITGEIST_NFO_DOCUMENT;
@@ -819,6 +883,20 @@
   g_free (children);
   g_free (all_children);
 
+  uri = ZEITGEIST_NCO_ORGANIZATION_CONTACT;
+  parents = g_new (char*, 2);
+  parents[0] = ZEITGEIST_NCO_CONTACT;
+  parents[1] = NULL;
+  children = g_new (char*, 1);
+  children[0] = NULL;
+  all_children = g_new (char*, 1);
+  all_children[0] = NULL;
+  info = symbol_info_new (uri, parents, children, all_children);
+  zeitgeist_register_symbol (info);
+  g_free (parents);
+  g_free (children);
+  g_free (all_children);
+
   uri = ZEITGEIST_NMM_MUSIC_ALBUM;
   parents = g_new (char*, 2);
   parents[0] = ZEITGEIST_NFO_MEDIA_LIST;
@@ -913,6 +991,19 @@
   g_free (children);
   g_free (all_children);
 
+  uri = ZEITGEIST_NCO_CONTACT_LIST;
+  parents = g_new (char*, 1);
+  parents[0] = NULL;
+  children = g_new (char*, 1);
+  children[0] = NULL;
+  all_children = g_new (char*, 1);
+  all_children[0] = NULL;
+  info = symbol_info_new (uri, parents, children, all_children);
+  zeitgeist_register_symbol (info);
+  g_free (parents);
+  g_free (children);
+  g_free (all_children);
+
   uri = ZEITGEIST_NMM_TVSERIES;
   parents = g_new (char*, 1);
   parents[0] = NULL;
@@ -930,6 +1021,21 @@
   parents = g_new (char*, 2);
   parents[0] = ZEITGEIST_NFO_MEDIA;
   parents[1] = NULL;
+  children = g_new (char*, 2);
+  children[0] = ZEITGEIST_NMM_MUSIC_PIECE;
+  children[1] = NULL;
+  all_children = g_new (char*, 2);
+  all_children[0] = ZEITGEIST_NMM_MUSIC_PIECE;
+  all_children[1] = NULL;
+  info = symbol_info_new (uri, parents, children, all_children);
+  zeitgeist_register_symbol (info);
+  g_free (parents);
+  g_free (children);
+  g_free (all_children);
+
+  uri = ZEITGEIST_NCO_CONTACT_GROUP;
+  parents = g_new (char*, 1);
+  parents[0] = NULL;
   children = g_new (char*, 1);
   children[0] = NULL;
   all_children = g_new (char*, 1);
@@ -985,6 +1091,37 @@
   g_free (children);
   g_free (all_children);
 
+  uri = ZEITGEIST_NMO_MESSAGE;
+  parents = g_new (char*, 1);
+  parents[0] = NULL;
+  children = g_new (char*, 3);
+  children[0] = ZEITGEIST_NMO_EMAIL;
+  children[1] = ZEITGEIST_NMO_IMMESSAGE;
+  children[2] = NULL;
+  all_children = g_new (char*, 3);
+  all_children[0] = ZEITGEIST_NMO_EMAIL;
+  all_children[1] = ZEITGEIST_NMO_IMMESSAGE;
+  all_children[2] = NULL;
+  info = symbol_info_new (uri, parents, children, all_children);
+  zeitgeist_register_symbol (info);
+  g_free (parents);
+  g_free (children);
+  g_free (all_children);
+
+  uri = ZEITGEIST_ZG_MOVE_EVENT;
+  parents = g_new (char*, 2);
+  parents[0] = ZEITGEIST_ZG_EVENT_INTERPRETATION;
+  parents[1] = NULL;
+  children = g_new (char*, 1);
+  children[0] = NULL;
+  all_children = g_new (char*, 1);
+  all_children[0] = NULL;
+  info = symbol_info_new (uri, parents, children, all_children);
+  zeitgeist_register_symbol (info);
+  g_free (parents);
+  g_free (children);
+  g_free (all_children);
+
   uri = ZEITGEIST_NCAL_TIMEZONE;
   parents = g_new (char*, 1);
   parents[0] = NULL;
@@ -1054,11 +1191,10 @@
   uri = ZEITGEIST_NFO_MEDIA;
   parents = g_new (char*, 1);
   parents[0] = NULL;
-  children = g_new (char*, 4);
+  children = g_new (char*, 3);
   children[0] = ZEITGEIST_NFO_VISUAL;
   children[1] = ZEITGEIST_NFO_AUDIO;
-  children[2] = ZEITGEIST_NMM_MUSIC_PIECE;
-  children[3] = NULL;
+  children[2] = NULL;
   all_children = g_new (char*, 12);
   all_children[0] = ZEITGEIST_NMM_TVSHOW;
   all_children[1] = ZEITGEIST_NMM_MUSIC_PIECE;
@@ -1266,8 +1402,8 @@
   children[5] = NULL;
   all_children = g_new (char*, 6);
   all_children[0] = ZEITGEIST_ZG_USER_ACTIVITY;
-  all_children[1] = ZEITGEIST_ZG_WORLD_ACTIVITY;
-  all_children[2] = ZEITGEIST_ZG_HEURISTIC_ACTIVITY;
+  all_children[1] = ZEITGEIST_ZG_HEURISTIC_ACTIVITY;
+  all_children[2] = ZEITGEIST_ZG_WORLD_ACTIVITY;
   all_children[3] = ZEITGEIST_ZG_SCHEDULED_ACTIVITY;
   all_children[4] = ZEITGEIST_ZG_SYSTEM_NOTIFICATION;
   all_children[5] = NULL;
@@ -1303,6 +1439,32 @@
   g_free (children);
   g_free (all_children);
 
+  uri = ZEITGEIST_NCO_CONTACT_LIST_DATA_OBJECT;
+  parents = g_new (char*, 1);
+  parents[0] = NULL;
+  children = g_new (char*, 1);
+  children[0] = NULL;
+  all_children = g_new (char*, 1);
+  all_children[0] = NULL;
+  info = symbol_info_new (uri, parents, children, all_children);
+  zeitgeist_register_symbol (info);
+  g_free (parents);
+  g_free (children);
+  g_free (all_children);
+
+  uri = ZEITGEIST_NFO_WEB_DATA_OBJECT;
+  parents = g_new (char*, 1);
+  parents[0] = NULL;
+  children = g_new (char*, 1);
+  children[0] = NULL;
+  all_children = g_new (char*, 1);
+  all_children[0] = NULL;
+  info = symbol_info_new (uri, parents, children, all_children);
+  zeitgeist_register_symbol (info);
+  g_free (parents);
+  g_free (children);
+  g_free (all_children);
+
   uri = ZEITGEIST_ZG_USER_ACTIVITY;
   parents = g_new (char*, 2);
   parents[0] = ZEITGEIST_ZG_EVENT_MANIFESTATION;

=== modified file 'tools/zeitgeist-symbols.template'
--- tools/zeitgeist-symbols.template	2011-03-07 14:19:39 +0000
+++ tools/zeitgeist-symbols.template	2012-02-02 12:43:21 +0000
@@ -92,7 +92,7 @@
  * 
  * Gets list of immediate parents of the specified symbol.
  *
- * Returns: A newly allocated list of immedate parents of this symbol.
+ * Returns: A newly allocated list of immediate parents of this symbol.
  *          The data elements of the list contain strings which you
  *          do not own, use g_strdup() if you intend to work with them.
  *          Free the list with a call to g_list_free().
@@ -112,7 +112,7 @@
   for (iter = info->parents; iter; iter = iter->next)
   {
     result = g_list_prepend (result,
-                             g_quark_to_string (GPOINTER_TO_INT (iter->data)));
+                             (gchar*) g_quark_to_string (GPOINTER_TO_INT (iter->data)));
   }
 
   return g_list_reverse (result);
@@ -144,7 +144,7 @@
   for (iter = info->children; iter; iter = iter->next)
   {
     result = g_list_prepend (result,
-                             g_quark_to_string (GPOINTER_TO_INT (iter->data)));
+                             (gchar*) g_quark_to_string (GPOINTER_TO_INT (iter->data)));
   }
 
   return g_list_reverse (result);
@@ -177,7 +177,7 @@
   for (iter = info->all_children; iter; iter = iter->next)
   {
     result = g_list_prepend (result,
-                             g_quark_to_string (GPOINTER_TO_INT (iter->data)));
+                             (gchar*) g_quark_to_string (GPOINTER_TO_INT (iter->data)));
   }
 
   return g_list_reverse (result);