summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeif Lotfy <seif@lotfy.com>2012-09-08 22:59:57 +0200
committerSeif Lotfy <seif@lotfy.com>2012-09-08 22:59:57 +0200
commit370242700e024ef4c87cdb83546cee973582cc1e (patch)
tree8c0f230efcbce8960ec5caba58aa6dc96e36f4c6
parentd5e0d96a4369df5e072fdd337d1d5ceddcbf9529 (diff)
make get_events return ResultSet
fix test case for it
-rw-r--r--libzeitgeist/log.vala4
-rw-r--r--test/c/test-log.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/libzeitgeist/log.vala b/libzeitgeist/log.vala
index 68b145db..0770b365 100644
--- a/libzeitgeist/log.vala
+++ b/libzeitgeist/log.vala
@@ -154,7 +154,7 @@ public class Log : QueuedProxyWrapper
num_events, result_type, cancellable);
}
- public async GenericArray<Event> get_events (
+ public async ResultSet get_events (
Array<uint32> event_ids,
Cancellable? cancellable=null) throws Error
{
@@ -163,7 +163,7 @@ public class Log : QueuedProxyWrapper
for (int i = 0; i < event_ids.length; i++)
simple_event_ids[i] = event_ids.index (i);
var result = yield proxy.get_events (simple_event_ids, cancellable);
- return Events.from_variant (result);
+ return new SimpleResultSet(Events.from_variant (result));
}
public async string[] find_related_uris (
diff --git a/test/c/test-log.c b/test/c/test-log.c
index 83af732a..087f5ce1 100644
--- a/test/c/test-log.c
+++ b/test/c/test-log.c
@@ -99,7 +99,7 @@ _on_events_received (ZeitgeistLog *log,
i = 0;
while (ev = zeitgeist_result_set_next_value (events))
{
- g_assert_cmpint (i, ==, zeitgeist_result_set_tell (events));
+ g_assert_cmpint (i + 1, ==, zeitgeist_result_set_tell (events));
_ev = ZEITGEIST_EVENT (g_ptr_array_index (expected_events, i));
g_assert_cmpstr (zeitgeist_event_get_interpretation (ev), ==,
zeitgeist_event_get_interpretation (_ev));