[grilo] vala: Fix Vala bindings

[Juan A. Suarez Romero <jasuarez src gnome org>]

commit a00b075fd6f76d2c9e7498e93bf40bfcd11b8c93
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Mon Jul 16 14:37:35 2012 +0000

    vala: Fix Vala bindings

 bindings/vala/grilo-0.2-custom.vala |    4 ----
 tools/vala/grilo-test.vala          |    9 +++++++--
 2 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/bindings/vala/grilo-0.2-custom.vala b/bindings/vala/grilo-0.2-custom.vala
index fad2a0f..9d9106a 100644
--- a/bindings/vala/grilo-0.2-custom.vala
+++ b/bindings/vala/grilo-0.2-custom.vala
@@ -7,10 +7,6 @@ namespace Grl {
 	public delegate void SourceResultCb (Grl.Source source, uint operation_id, Grl.Media? media, uint remaining, GLib.Error? error);
 	[CCode (instance_pos = 3.1)]
 	public delegate void SourceStoreCb (Grl.Source source, Grl.MediaBox? parent, Grl.Media? media, GLib.Error? error);
-	[CCode (instance_pos = 3.1)]
-	public delegate void SourceResolveCb (Grl.Source source, uint operation_id, Grl.Media? media, GLib.Error? error);
-	[CCode (instance_pos = 3.1)]
-	public delegate void SourceStoreMetadataCb (Grl.Source source, Grl.Media? media, GLib.List failed_keys, GLib.Error? error);
 
 	[Compact]
 	public class MetadataKey {
diff --git a/tools/vala/grilo-test.vala b/tools/vala/grilo-test.vala
index be0b242..8aba53b 100644
--- a/tools/vala/grilo-test.vala
+++ b/tools/vala/grilo-test.vala
@@ -34,7 +34,7 @@ public class SimplePlaylist : Object {
 	}
 
 	private void search_cb (Grl.Source source,
-							uint browse_id,
+							uint operation_id,
 							Grl.Media? media,
 							uint remaining,
 							GLib.Error? error) {
@@ -62,10 +62,15 @@ public class SimplePlaylist : Object {
 
 	public void search (string q) {
 		unowned GLib.List keys = Grl.MetadataKey.list_new (Grl.MetadataKey.ID, Grl.MetadataKey.TITLE, Grl.MetadataKey.URL);
+      Caps caps = null;
+      OperationOptions options = new OperationOptions(caps);
+      options.set_skip (0);
+      options.set_count (100);
+      options.set_flags (ResolutionFlags.FULL | ResolutionFlags.IDLE_RELAY);
 
 		foreach (Grl.Source source in source_list) {
 			debug ("%s - %s", source.get_name (), q);
-			source.search (q, keys, 0, 100, Grl.ResolutionFlags.FULL | Grl.ResolutionFlags.IDLE_RELAY, search_cb);
+			source.search (q, keys, options, search_cb);
 		}
 	}