diff options
| author | David King <amigadave@amigadave.com> | 2019-01-30 07:55:44 +0000 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2019-01-31 15:53:26 +0100 |
| commit | 151b17231bd6c19aa7202973a420b823b27fdd25 (patch) | |
| tree | 1e52e63dae92615a5db30a79ee3c8e6bba622df1 | |
| parent | 284f77c4db11c660dc99917aae38a71baf63e09f (diff) | |
| download | zeitgeist-151b17231bd6c19aa7202973a420b823b27fdd25.tar.gz | |
fts: Correctly implement the org.gnome.zeitgeist.Index DBus interface
Adapt fully for commit 131a84f1
| -rw-r--r-- | extensions/fts.vala | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/extensions/fts.vala b/extensions/fts.vala index 359cd030..72404e5f 100644 --- a/extensions/fts.vala +++ b/extensions/fts.vala @@ -29,6 +29,7 @@ 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) throws Error; public abstract async void search_with_relevancies ( @@ -36,6 +37,7 @@ namespace Zeitgeist [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) throws Error; @@ -177,13 +179,14 @@ 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) throws Error + Cancellable? cancellable, out Variant events, + out uint matches) throws Error { if (siin == null) yield wait_for_proxy (); var timer = new Timer (); yield siin.search (query_string, time_range, filter_templates, - offset, count, result_type, null, + offset, count, result_type, cancellable, out events, out matches); debug ("Got %u[/%u] results from indexer (in %f seconds)", (uint) events.n_children (), matches, timer.elapsed ()); @@ -193,15 +196,15 @@ namespace Zeitgeist string query_string, Variant time_range, Variant filter_templates, uint storage_state, uint offset, uint count, uint result_type, - out Variant events, out double[] relevancies, out uint matches) - throws Error + Cancellable? cancellable, out Variant events, + out double[] relevancies, out uint matches) throws Error { if (siin == null) yield wait_for_proxy (); var timer = new Timer (); yield siin.search_with_relevancies ( query_string, time_range, filter_templates, - storage_state, offset, count, result_type, null, + storage_state, offset, count, result_type, cancellable, out events, out relevancies, out matches); debug ("Got %u[/%u] results from indexer (in %f seconds)", |