diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2018-06-05 23:23:26 +0200 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2018-06-05 23:24:02 +0200 |
| commit | 131a84f1a65a4ce8bffd94f52746425f7e96b7ae (patch) | |
| tree | 103e8e291a6775faad31e016542eb13a0ad8c63c /libzeitgeist | |
| parent | e5ee7accb7057631c7e83a1c372e7c5c161c409d (diff) | |
| download | zeitgeist-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 'libzeitgeist')
| -rw-r--r-- | libzeitgeist/index.vala | 6 | ||||
| -rw-r--r-- | libzeitgeist/remote.vala | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/libzeitgeist/index.vala b/libzeitgeist/index.vala index e19621a5..458247ad 100644 --- a/libzeitgeist/index.vala +++ b/libzeitgeist/index.vala @@ -137,7 +137,7 @@ public class Index : QueuedProxyWrapper yield proxy.search (query, time_range.to_variant (), Events.to_variant (event_templates_cp), offset, num_events, - result_type, out result, out matches, cancellable); + result_type, cancellable, out result, out matches); return new SimpleResultSet.with_num_matches ( Events.from_variant (result), matches); @@ -195,8 +195,8 @@ public class Index : QueuedProxyWrapper yield proxy.search_with_relevancies (query, time_range.to_variant (), Events.to_variant (event_templates_cp), storage_state, offset, - num_events, result_type, out relevancies_variant, out result, - out matches, cancellable); + num_events, result_type, cancellable, out relevancies_variant, + out result, out matches); relevancies = new double[relevancies_variant.n_children ()]; VariantIter iter = relevancies_variant.iterator (); diff --git a/libzeitgeist/remote.vala b/libzeitgeist/remote.vala index 0035e154..677aef5f 100644 --- a/libzeitgeist/remote.vala +++ b/libzeitgeist/remote.vala @@ -141,16 +141,17 @@ namespace Zeitgeist [DBus (signature = "(xx)")] Variant time_range, [DBus (signature = "a(asaasay)")] Variant filter_templates, uint offset, uint count, uint result_type, + Cancellable? cancellable, [DBus (signature = "a(asaasay)")] out Variant events, - out uint matches, Cancellable? cancellable=null) throws Error; + out uint matches) throws Error; public abstract async void search_with_relevancies ( string query_string, [DBus (signature = "(xx)")] Variant time_range, [DBus (signature = "a(asaasay)")] Variant filter_templates, uint storage_state, uint offset, uint count, uint result_type, + Cancellable? cancellable, [DBus (signature = "a(asaasay)")] out Variant events, - out double[] relevancies, out uint matches, - Cancellable? cancellable=null) throws Error; + out double[] relevancies, out uint matches) throws Error; } /* FIXME: Remove this! Only here because of a bug |