Move utils.vala to libzeitgeist

 - Moved utils.vala to libzeitgeist/
 - Moved Utils.retire_database to sql.vala
 - Removed duplicate utility functions from datamodel.vala introduced in
   previous commits
 - Updated extensions to use DataModelError instad of EngineError
 - Removed unused .vala symlinks from FTS++

7 files changed, 9 insertions, 13 deletions

diff --git a/extensions/blacklist.vala b/extensions/blacklist.vala
index ec69969d..666d376d 100644
--- a/extensions/blacklist.vala
+++ b/extensions/blacklist.vala
@@ -47,7 +47,7 @@ namespace Zeitgeist
         private const string SIG_BLACKLIST = "a{s("+Utils.SIG_EVENT+")}";
 
         private static HashTable<string, Event> from_variant (
-            Variant templates_variant) throws EngineError
+            Variant templates_variant) throws DataModelError
         {
             var blacklist = new HashTable<string, Event> (str_hash, str_equal);
 
@@ -105,7 +105,7 @@ namespace Zeitgeist
                 {
                     blacklist = BlacklistTemplates.from_variant (templates);
                 }
-                catch (EngineError e)
+                catch (DataModelError e)
                 {
                     warning ("Could not load blacklist from variant: %s", e.message);
                     blacklist = new HashTable<string, Event> (str_hash, str_equal);
@@ -172,7 +172,7 @@ namespace Zeitgeist
         }
 
         public void add_template (string template_id, Variant event_template)
-            throws EngineError
+            throws DataModelError
         {
             Event template = new Event.from_variant (event_template);
             blacklist.insert (template_id, template);
diff --git a/extensions/ds-registry.vala b/extensions/ds-registry.vala
index 46beb374..b45ccd2e 100644
--- a/extensions/ds-registry.vala
+++ b/extensions/ds-registry.vala
@@ -72,7 +72,7 @@ namespace Zeitgeist
         }
 
         public DataSource.from_variant (Variant variant,
-            bool reset_running=false) throws EngineError
+            bool reset_running=false) throws DataModelError
         {
             warn_if_fail (
                 variant.get_type_string () == "(sssa("+Utils.SIG_EVENT+")bxb)"
@@ -127,7 +127,7 @@ namespace Zeitgeist
             "a(sssa("+Utils.SIG_EVENT+")bxb)";
 
         private static HashTable<string, DataSource> from_variant (
-            Variant sources_variant, bool reset_running=false) throws EngineError
+            Variant sources_variant, bool reset_running=false) throws DataModelError
         {
             var registry = new HashTable<string, DataSource> (
                 str_hash, str_equal);
@@ -194,7 +194,7 @@ namespace Zeitgeist
                 {
                     sources = DataSources.from_variant (registry, true);
                 }
-                catch (EngineError e)
+                catch (DataModelError e)
                 {
                     warning ("Error while loading datasource registry: %s", e.message);
                     sources = new HashTable<string, DataSource> (
@@ -265,7 +265,7 @@ namespace Zeitgeist
         }
 
         public bool register_data_source (string unique_id, string name,
-            string description, Variant event_templates, BusName? sender) throws EngineError
+            string description, Variant event_templates, BusName? sender) throws  DataModelError
         {
             debug ("%s: %s, %s, %s", Log.METHOD, unique_id, name, description);
             if (sender == null)
diff --git a/extensions/fts++/Makefile.am b/extensions/fts++/Makefile.am
index 2cfe2891..3f6137cc 100644
--- a/extensions/fts++/Makefile.am
+++ b/extensions/fts++/Makefile.am
@@ -29,13 +29,13 @@ AM_VALAFLAGS = \
 
 libzeitgeist_internal_la_VALASOURCES = \
 	../../libzeitgeist/datamodel.vala \
-	../../libzeitgeist/ontology.vala \
 	../../libzeitgeist/ontology-uris.vala \
+	../../libzeitgeist/ontology.vala \
+	../../libzeitgeist/utils.vala \
 	db-reader.vala \
 	engine.vala \
 	sql.vala \
 	remote.vala \
-	utils.vala \
 	errors.vala \
 	table-lookup.vala \
 	sql-schema.vala \
diff --git a/extensions/fts++/datamodel.vala b/extensions/fts++/datamodel.vala
deleted file mode 120000
index 02172aac..00000000
--- a/extensions/fts++/datamodel.vala
+++ /dev/null
@@ -1 +0,0 @@
-../../src/datamodel.vala
\ No newline at end of file
diff --git a/extensions/fts++/ontology-uris.vala b/extensions/fts++/ontology-uris.vala
deleted file mode 120000
index c0b93ab7..00000000
--- a/extensions/fts++/ontology-uris.vala
+++ /dev/null
@@ -1 +0,0 @@
-../../src/ontology-uris.vala
\ No newline at end of file
diff --git a/extensions/fts++/ontology.vala b/extensions/fts++/ontology.vala
deleted file mode 120000
index 5daa0215..00000000
--- a/extensions/fts++/ontology.vala
+++ /dev/null
@@ -1 +0,0 @@
-../../src/ontology.vala
\ No newline at end of file
diff --git a/extensions/fts++/utils.vala b/extensions/fts++/utils.vala
deleted file mode 120000
index 6da71ce8..00000000
--- a/extensions/fts++/utils.vala
+++ /dev/null
@@ -1 +0,0 @@
-../../src/utils.vala
\ No newline at end of file