More build system fixes. Looks like everything is working now :)

7 files changed, 28 insertions, 16 deletions

diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index 060f36b8..0e422f70 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -4,12 +4,17 @@ endif
 
 NULL =
 
+zeitgeist_libs = \
+	$(top_builddir)/libzeitgeist/libzeitgeist-2.0.la \
+	$(ZEITGEIST_LIBS)
+
 #extensionsdir = $(libdir)/zeitgeist/extensions
 noinst_LTLIBRARIES = ds-registry.la blacklist.la storage-monitor.la fts.la benchmark.la
 
 AM_CPPFLAGS = \
 	$(ZEITGEIST_CFLAGS) \
 	-include $(CONFIG_HEADER) \
+	-I $(top_srcdir)/libzeitgeist \
 	-I $(top_srcdir)/src \
 	-w \
 	$(NULL)
@@ -19,6 +24,7 @@ VALAFLAGS = \
 	--pkg gio-2.0 \
 	--pkg sqlite3 \
 	--pkg gmodule-2.0 \
+	$(top_srcdir)/libzeitgeist/zeitgeist-private.vapi \
 	$(top_srcdir)/src/zeitgeist-engine.vapi \
 	$(NULL)
 
diff --git a/extensions/benchmark.vala b/extensions/benchmark.vala
index e6826cc4..76bfd377 100644
--- a/extensions/benchmark.vala
+++ b/extensions/benchmark.vala
@@ -107,7 +107,7 @@ namespace Zeitgeist
                 warning ("%s", err.message);
             }
 
-            debug ("%s, this.ref_count = %u", Log.METHOD, this.ref_count);
+            debug ("%s, this.ref_count = %u", GLib.Log.METHOD, this.ref_count);
         }
 
     }
diff --git a/extensions/blacklist.vala b/extensions/blacklist.vala
index 666d376d..fa81e254 100644
--- a/extensions/blacklist.vala
+++ b/extensions/blacklist.vala
@@ -145,7 +145,7 @@ namespace Zeitgeist
                 warning ("%s", err.message);
             }
 
-            debug ("%s, this.ref_count = %u", Log.METHOD, this.ref_count);
+            debug ("%s, this.ref_count = %u", GLib.Log.METHOD, this.ref_count);
         }
 
         private void flush ()
diff --git a/extensions/ds-registry.vala b/extensions/ds-registry.vala
index 6c431c0c..6555762f 100644
--- a/extensions/ds-registry.vala
+++ b/extensions/ds-registry.vala
@@ -130,10 +130,10 @@ namespace Zeitgeist
             }
 
             flush ();
-            debug ("%s, this.ref_count = %u", Log.METHOD, this.ref_count);
+            debug ("%s, this.ref_count = %u", GLib.Log.METHOD, this.ref_count);
         }
 
-        public Variant get_data_sources ()
+        public async Variant get_data_sources (Cancellable? cancellable=null)
         {
             return DataSources.to_variant (sources);
         }
@@ -149,13 +149,16 @@ namespace Zeitgeist
             return false;
         }
 
-        public bool register_data_source (string unique_id, string name,
-            string description, Variant event_templates, BusName? sender) throws  DataModelError
+        public async bool register_data_source (string unique_id,
+            string name, string description, Variant event_templates,
+            Cancellable? cancellable=null, BusName? sender)
+            throws DataModelError
         {
-            debug ("%s: %s, %s, %s", Log.METHOD, unique_id, name, description);
+            debug ("%s: %s, %s, %s", GLib.Log.METHOD, unique_id,
+                name, description);
             if (sender == null)
             {
-                warning ("%s: sender == null, ignoring request", Log.METHOD);
+                warning ("%s: sender == null, ignoring request", GLib.Log.METHOD);
                 return false;
             }
 
@@ -182,10 +185,11 @@ namespace Zeitgeist
                 bus_name_2_ds.insert (sender, MULTIPLE_MARKER);
             }
 
+            GenericArray<Event> templates; // Vala: block scopes in async buggy
             unowned DataSource? ds = sources.lookup (unique_id);
             if (ds != null)
             {
-                var templates = Events.from_variant (event_templates);
+                templates = Events.from_variant (event_templates);
                 ds.name = name;
                 ds.description = description;
                 ds.event_templates = templates;
@@ -199,7 +203,7 @@ namespace Zeitgeist
             }
             else
             {
-                var templates = Events.from_variant (event_templates);
+                templates = Events.from_variant (event_templates);
                 DataSource new_ds = new DataSource.full (unique_id, name,
                     description, templates);
                 new_ds.enabled = true;
@@ -215,9 +219,10 @@ namespace Zeitgeist
 
         }
 
-        public void set_data_source_enabled (string unique_id, bool enabled)
+        public async void set_data_source_enabled (string unique_id, bool enabled,
+            Cancellable? cancellable=null)
         {
-            debug ("%s: %s, %d", Log.METHOD, unique_id, (int) enabled);
+            debug ("%s: %s, %d", GLib.Log.METHOD, unique_id, (int) enabled);
             unowned DataSource? ds = sources.lookup (unique_id);
             if (ds != null)
             {
@@ -234,7 +239,8 @@ namespace Zeitgeist
             }
         }
 
-        public Variant get_data_source_from_id (string unique_id) throws Error
+        public async Variant get_data_source_from_id (string unique_id,
+            Cancellable? cancellable=null) throws Error
         {
             unowned DataSource? ds = sources.lookup (unique_id);
             if (ds != null)
diff --git a/extensions/fts.vala b/extensions/fts.vala
index 53312033..49cddbb4 100644
--- a/extensions/fts.vala
+++ b/extensions/fts.vala
@@ -170,7 +170,7 @@ namespace Zeitgeist
                 warning ("%s", err.message);
             }
 
-            debug ("%s, this.ref_count = %u", Log.METHOD, this.ref_count);
+            debug ("%s, this.ref_count = %u", GLib.Log.METHOD, this.ref_count);
         }
 
         public async void search (string query_string, Variant time_range,
diff --git a/extensions/histogram.vala b/extensions/histogram.vala
index d5aa28a1..11ce45aa 100644
--- a/extensions/histogram.vala
+++ b/extensions/histogram.vala
@@ -66,7 +66,7 @@ namespace Zeitgeist
                 warning ("%s", err.message);
             }
 
-            debug ("%s, this.ref_count = %u", Log.METHOD, this.ref_count);
+            debug ("%s, this.ref_count = %u", GLib.Log.METHOD, this.ref_count);
         }
 
         public Variant get_histogram_data () throws Error
diff --git a/extensions/storage-monitor.vala b/extensions/storage-monitor.vala
index a0010e4a..f1c1eeed 100644
--- a/extensions/storage-monitor.vala
+++ b/extensions/storage-monitor.vala
@@ -217,7 +217,7 @@ namespace Zeitgeist
                 warning ("%s", err.message);
             }
 
-            debug ("%s, this.ref_count = %u", Log.METHOD, this.ref_count);
+            debug ("%s, this.ref_count = %u", GLib.Log.METHOD, this.ref_count);
         }
 
         private void prepare_queries () throws EngineError