[tracker/libtracker-bus: 48/52] Adapt to libtracker-sparql changes

[Jürg Billeter <juergbi src gnome org>]

commit 073efd2a1e87bb01f787a988809c038b17e33945
Author: Jürg Billeter <j bitron ch>
Date:   Tue Aug 10 15:11:12 2010 +0200

    Adapt to libtracker-sparql changes

 src/libtracker-bus/tracker-bus.vala |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/src/libtracker-bus/tracker-bus.vala b/src/libtracker-bus/tracker-bus.vala
index f2a2600..2821681 100644
--- a/src/libtracker-bus/tracker-bus.vala
+++ b/src/libtracker-bus/tracker-bus.vala
@@ -29,10 +29,9 @@ private interface Tracker.Bus.Resources : GLib.Object {
 	[DBus (name = "SparqlUpdate")]
 	public abstract async void sparql_update_async (string query) throws DBus.Error;
 
+	public abstract void load (string uri) throws DBus.Error;
 	[DBus (name = "Load")]
-	public abstract void import (string uri) throws DBus.Error;
-	[DBus (name = "Load")]
-	public abstract async void import_async (string uri) throws DBus.Error;
+	public abstract async void load_async (string uri) throws DBus.Error;
 }
 
 [DBus (name = "org.freedesktop.Tracker1.Statistics")]
@@ -89,7 +88,7 @@ public class Tracker.Bus.Connection : Tracker.Sparql.Connection {
 		initialized = false;
 	}
 
-	public override Sparql.Cursor? query (string sparql, Cancellable? cancellable) throws Sparql.Error {
+	public override Sparql.Cursor query (string sparql, Cancellable? cancellable) throws Sparql.Error {
 		try {
 			if (use_steroids) {
 				return tracker_bus_fd_query (connection, sparql);
@@ -102,7 +101,7 @@ public class Tracker.Bus.Connection : Tracker.Sparql.Connection {
 		}
 	}
 
-	public async override Sparql.Cursor? query_async (string sparql, Cancellable? cancellable = null) throws Sparql.Error {
+	public async override Sparql.Cursor query_async (string sparql, Cancellable? cancellable = null) throws Sparql.Error {
 		try {
 			if (use_steroids) {
 				return yield tracker_bus_fd_query_async (connection, sparql);
@@ -115,7 +114,7 @@ public class Tracker.Bus.Connection : Tracker.Sparql.Connection {
 		}
 	}
 
-	public override void update (string sparql, Cancellable? cancellable = null) throws Sparql.Error {
+	public override void update (string sparql, int priority = GLib.Priority.DEFAULT, Cancellable? cancellable = null) throws Sparql.Error {
 		try {
 			if (use_steroids) {
 				tracker_bus_fd_sparql_update (connection, sparql);
@@ -139,7 +138,7 @@ public class Tracker.Bus.Connection : Tracker.Sparql.Connection {
 		}
 	}
 
-	public override GLib.Variant? update_blank (string sparql, Cancellable? cancellable = null) throws Sparql.Error {
+	public override GLib.Variant? update_blank (string sparql, int priority = GLib.Priority.DEFAULT, Cancellable? cancellable = null) throws Sparql.Error {
 		GLib.Variant res = null;
 
 		if (use_steroids) {
@@ -162,16 +161,16 @@ public class Tracker.Bus.Connection : Tracker.Sparql.Connection {
 		return res;
 	}
 
-	public override void import (File file, Cancellable? cancellable = null) throws Sparql.Error {
+	public override void load (File file, Cancellable? cancellable = null) throws Sparql.Error {
 		try {
-			resources_object.import (file.get_uri ());
+			resources_object.load (file.get_uri ());
 		} catch (DBus.Error e) {
 			throw new Sparql.Error.INTERNAL (e.message);
 		}
 	}
-	public async override void import_async (File file, Cancellable? cancellable = null) throws Sparql.Error {
+	public async override void load_async (File file, Cancellable? cancellable = null) throws Sparql.Error {
 		try {
-			yield resources_object.import_async (file.get_uri ());
+			yield resources_object.load_async (file.get_uri ());
 		} catch (DBus.Error e) {
 			throw new Sparql.Error.INTERNAL (e.message);
 		}