diff options
| author | Seif Lotfy <seif@lotfy.com> | 2012-09-08 23:20:28 +0200 |
|---|---|---|
| committer | Seif Lotfy <seif@lotfy.com> | 2012-09-08 23:20:28 +0200 |
| commit | fb930841790b008e9d9d932d50822eda6125d71b (patch) | |
| tree | 240c7fdc0a542471966684b70b78fa233f9f8918 | |
| parent | 370242700e024ef4c87cdb83546cee973582cc1e (diff) | |
Undo last commit and fix test cases to cast simpleresult set from
generic array
| -rw-r--r-- | libzeitgeist/log.vala | 4 | ||||
| -rw-r--r-- | test/c/test-log.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libzeitgeist/log.vala b/libzeitgeist/log.vala index 0770b365..68b145db 100644 --- a/libzeitgeist/log.vala +++ b/libzeitgeist/log.vala @@ -154,7 +154,7 @@ public class Log : QueuedProxyWrapper num_events, result_type, cancellable); } - public async ResultSet get_events ( + public async GenericArray<Event> 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 new SimpleResultSet(Events.from_variant (result)); + return 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 087f5ce1..916c8315 100644 --- a/test/c/test-log.c +++ b/test/c/test-log.c @@ -74,6 +74,7 @@ _on_events_received (ZeitgeistLog *log, GAsyncResult *res, GPtrArray *expected_events) { + GArray *events_array; ZeitgeistResultSet *events; GArray *event_ids; GError *error; @@ -82,7 +83,8 @@ _on_events_received (ZeitgeistLog *log, guint32 event_id; error = NULL; - events = zeitgeist_log_get_events_finish (log, res, &error); + events_array = zeitgeist_log_get_events_finish (log, res, &error); + events = zeitgeist_simple_result_set_new (events_array); if (error) { g_critical ("Failed to get events: %s", error->message); @@ -99,7 +101,7 @@ _on_events_received (ZeitgeistLog *log, i = 0; while (ev = zeitgeist_result_set_next_value (events)) { - g_assert_cmpint (i + 1, ==, 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)); |