summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2018-06-05 23:23:26 +0200
committerRico Tzschichholz <ricotz@ubuntu.com>2018-06-05 23:24:02 +0200
commit131a84f1a65a4ce8bffd94f52746425f7e96b7ae (patch)
tree103e8e291a6775faad31e016542eb13a0ad8c63c /extensions
parente5ee7accb7057631c7e83a1c372e7c5c161c409d (diff)
downloadzeitgeist-131a84f1a65a4ce8bffd94f52746425f7e96b7ae.tar.gz
Asynchronous out-parameters are only allowed at the end of argument lists
This will not result in an ABI/API change on the c-level.
Diffstat (limited to 'extensions')
-rw-r--r--extensions/fts++/zeitgeist-fts.vala8
-rw-r--r--extensions/fts.vala4
2 files changed, 6 insertions, 6 deletions
diff --git a/extensions/fts++/zeitgeist-fts.vala b/extensions/fts++/zeitgeist-fts.vala
index e408ff34..0f8ecbc6 100644
--- a/extensions/fts++/zeitgeist-fts.vala
+++ b/extensions/fts++/zeitgeist-fts.vala
@@ -118,8 +118,8 @@ namespace Zeitgeist
public async void search (string query_string, Variant time_range,
Variant filter_templates,
uint offset, uint count, uint result_type,
- out Variant events, out uint matches,
- Cancellable? cancellable=null)
+ Cancellable? cancellable,
+ out Variant events, out uint matches)
throws Error
{
var tr = new TimeRange.from_variant (time_range);
@@ -140,9 +140,9 @@ namespace Zeitgeist
Variant filter_templates,
uint storage_state, uint offset,
uint count, uint result_type,
+ Cancellable? cancellable,
out Variant events, out double[] relevancies,
- out uint matches,
- Cancellable? cancellable=null)
+ out uint matches)
throws Error
{
var tr = new TimeRange.from_variant (time_range);
diff --git a/extensions/fts.vala b/extensions/fts.vala
index 0b8d81b7..359cd030 100644
--- a/extensions/fts.vala
+++ b/extensions/fts.vala
@@ -183,7 +183,7 @@ namespace Zeitgeist
var timer = new Timer ();
yield siin.search (query_string, time_range, filter_templates,
- offset, count, result_type,
+ offset, count, result_type, null,
out events, out matches);
debug ("Got %u[/%u] results from indexer (in %f seconds)",
(uint) events.n_children (), matches, timer.elapsed ());
@@ -201,7 +201,7 @@ namespace Zeitgeist
var timer = new Timer ();
yield siin.search_with_relevancies (
query_string, time_range, filter_templates,
- storage_state, offset, count, result_type,
+ storage_state, offset, count, result_type, null,
out events, out relevancies, out matches);
debug ("Got %u[/%u] results from indexer (in %f seconds)",