Fixed log.vala to return ResultSet and avoid crashes in examples

4 files changed, 34 insertions, 8 deletions

diff --git a/examples/c/Makefile.am b/examples/c/Makefile.am
index 0d165cb6..43e692ba 100644
--- a/examples/c/Makefile.am
+++ b/examples/c/Makefile.am
@@ -23,7 +23,8 @@ helper_sources = \
 noinst_PROGRAMS = \
   find-events \
   monitor-events \
-  search-events
+  search-events \
+  get-events
 
 find_events_SOURCES = find-events.c
 find_events_LDADD   = $(zeitgeist_libs)
@@ -33,3 +34,6 @@ monitor_events_LDADD   = $(zeitgeist_libs)
 
 search_events_SOURCES = search-events.c
 search_events_LDADD   = $(zeitgeist_libs)
+
+get_events_SOURCES = get-events.c
+get_events_LDADD   = $(zeitgeist_libs)
diff --git a/examples/c/find-events.c b/examples/c/find-events.c
index 7c80c2e8..637bbc4d 100644
--- a/examples/c/find-events.c
+++ b/examples/c/find-events.c
@@ -70,7 +70,7 @@ main (gint   argc,
   GPtrArray          *templates;
   
   mainloop = g_main_loop_new (NULL, FALSE);
-  log = g_object_new (ZEITGEIST_TYPE_LOG, NULL);
+  log = zeitgeist_log_new();
   
   templates = g_ptr_array_new ();
   g_ptr_array_add (templates, zeitgeist_event_new ());
@@ -84,8 +84,8 @@ main (gint   argc,
                              NULL,
                              (GAsyncReadyCallback)on_events_received,
                              mainloop);
-  
+
   g_main_loop_run (mainloop);
-  
+
   return 0;
 }
diff --git a/examples/js/find_events.js b/examples/js/find_events.js
new file mode 100644
index 00000000..9a142a64
--- /dev/null
+++ b/examples/js/find_events.js
@@ -0,0 +1,23 @@
+const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;
+const Zeitgeist = imports.gi.Zeitgeist;
+
+let zglog = Zeitgeist.Log.get_default();
+
+let ids = [];
+for (let i=200; i<222; i++){
+    ids.push(i);
+}
+
+zglog.get_events(ids, null, Lang.bind(this,
+            function(zg, result, data) {
+                print ("===")
+                let events = zg.get_events_finish(result);
+                for (let i=0; i<events.size(); i++) {
+                        print (i)
+                        print(events[i]);
+                 }
+            }),
+            null);
+
+Gtk.main();
diff --git a/examples/python/find_events.py b/examples/python/find_events.py
index 3ae53327..5d0da009 100644
--- a/examples/python/find_events.py
+++ b/examples/python/find_events.py
@@ -3,10 +3,9 @@ log = Zeitgeist.Log.get_default()
 
 def callback (log, result, data):
     events = log.get_events_finish(result)
-    print len(events)
-    for event in events:
-        if event:
-            print event.num_subjects()
+    print events.size()
+    for i in xrange(events.size()):
+        print events.next_value()
     Gtk.main_quit()
 
 log.get_events([x for x in xrange(200, 222)], None, callback, None)