warning--

6 files changed, 36 insertions, 17 deletions

diff --git a/extensions/blacklist.vala b/extensions/blacklist.vala
index 23034e3d..e842cacb 100644
--- a/extensions/blacklist.vala
+++ b/extensions/blacklist.vala
@@ -49,3 +49,3 @@ namespace Zeitgeist
         private static HashTable<string, Event> from_variant (
-            Variant templates_variant)
+            Variant templates_variant) throws EngineError
         {
@@ -101,6 +101,12 @@ namespace Zeitgeist
                 BlacklistTemplates.SIG_BLACKLIST);
-            if (templates != null)
-                blacklist = BlacklistTemplates.from_variant (templates);
-            else
+            if (templates != null) {
+                try {
+                    blacklist = BlacklistTemplates.from_variant (templates);
+                } catch (EngineError e) {
+                    warning ("Could not load blacklist from variant: %s", e.message);
+                    blacklist = new HashTable<string, Event> (str_hash, str_equal);
+                }
+            } else {
                 blacklist = new HashTable<string, Event> (str_hash, str_equal);
+            }
 
diff --git a/extensions/ds-registry.vala b/extensions/ds-registry.vala
index c651d039..359d1b2d 100644
--- a/extensions/ds-registry.vala
+++ b/extensions/ds-registry.vala
@@ -74,3 +74,3 @@ namespace Zeitgeist
         public DataSource.from_variant (Variant variant,
-            bool reset_running=false)
+            bool reset_running=false) throws EngineError
         {
@@ -129,3 +129,3 @@ namespace Zeitgeist
         private static HashTable<string, DataSource> from_variant (
-            Variant sources_variant, bool reset_running=false)
+            Variant sources_variant, bool reset_running=false) throws EngineError
         {
@@ -187,7 +187,12 @@ namespace Zeitgeist
                 DataSources.SIG_DATASOURCES);
-            if (registry != null)
-                sources = DataSources.from_variant (registry, true);
-            else
+            if (registry != null) {
+                try {
+                    sources = DataSources.from_variant (registry, true);
+                } catch (EngineError e) {
+                    warning ("Error while loading datasource registry: %s", e.message);
+                }
+            } else {
                 sources = new HashTable<string, DataSource> (
                     str_hash, str_equal);
+            }
 
@@ -251,3 +256,3 @@ namespace Zeitgeist
         public bool register_data_source (string unique_id, string name,
-            string description, Variant event_templates, BusName? sender)
+            string description, Variant event_templates, BusName? sender) throws EngineError
         {
diff --git a/extensions/fts++/zeitgeist-fts.vala b/extensions/fts++/zeitgeist-fts.vala
index 79bc1905..72cd8d45 100644
--- a/extensions/fts++/zeitgeist-fts.vala
+++ b/extensions/fts++/zeitgeist-fts.vala
@@ -101,3 +101,3 @@ namespace Zeitgeist
         public async void notify_insert (Variant time_range, Variant events)
-            throws IOError
+            throws IOError, EngineError
         {
@@ -179,3 +179,3 @@ namespace Zeitgeist
                 DBusProxyFlags.DO_NOT_LOAD_PROPERTIES);
-            bool zeitgeist_up = proxy.name_has_owner (ZEITGEIST_DBUS_NAME);
+            // bool zeitgeist_up = proxy.name_has_owner (ZEITGEIST_DBUS_NAME);
             // FIXME: throw an error that zeitgeist isn't up? or just start it?
diff --git a/extensions/storage-monitor.vala b/extensions/storage-monitor.vala
index 950377dd..6577f10c 100644
--- a/extensions/storage-monitor.vala
+++ b/extensions/storage-monitor.vala
@@ -379,3 +379,7 @@ namespace Zeitgeist
                 int rc = update_storage_medium_stmt.step ();
-                database.assert_query_success (rc, "add_storage_medium", Sqlite.DONE);
+                try {
+                    database.assert_query_success (rc, "add_storage_medium", Sqlite.DONE);
+                } catch (EngineError e) {
+                    warning ("Could not add storage medium: %s", e.message);
+                }
             }
@@ -397,4 +401,8 @@ namespace Zeitgeist
                 int rc = update_medium_state_stmt.step ();
-                database.assert_query_success (rc, "remove_storage_medium",
-                    Sqlite.DONE);
+                try {
+                    database.assert_query_success (rc, "remove_storage_medium",
+                        Sqlite.DONE);
+                } catch (EngineError e) {
+                    warning ("Could not remove storage medium: %s", e.message);
+                }
             }
diff --git a/src/datamodel.vala b/src/datamodel.vala
index 16215d4c..edfc54c8 100644
--- a/src/datamodel.vala
+++ b/src/datamodel.vala
@@ -78,3 +78,3 @@ namespace Zeitgeist
         public TimeRange.from_variant (Variant variant)
-            throws EngineError.INVALID_SIGNATURE
+            throws EngineError
         {
diff --git a/src/remote.vala b/src/remote.vala
index 9c780521..af3e5bcf 100644
--- a/src/remote.vala
+++ b/src/remote.vala
@@ -103,3 +103,3 @@ namespace Zeitgeist
             [DBus (signature = "a(asaasay)")] Variant events
-        ) throws IOError;
+        ) throws IOError, EngineError;