[tracker/direct-access-update-fd-passing] Squash

[Philip Van Hoof <pvanhoof src gnome org>]

commit edf71a438a3a1b49e0f3add4e1342202a521961c
Author: Philip Van Hoof <philip codeminded be>
Date:   Wed Jul 21 17:32:55 2010 +0200

    Squash

 src/libtracker-bus/tracker-bus-fd-update.c    |   12 ++++++------
 src/libtracker-bus/tracker-bus-fd-update.vapi |    8 ++++----
 src/libtracker-bus/tracker-bus.vala           |    4 ----
 3 files changed, 10 insertions(+), 14 deletions(-)
---
diff --git a/src/libtracker-bus/tracker-bus-fd-update.c b/src/libtracker-bus/tracker-bus-fd-update.c
index aa330c4..d90c652 100644
--- a/src/libtracker-bus/tracker-bus-fd-update.c
+++ b/src/libtracker-bus/tracker-bus-fd-update.c
@@ -241,8 +241,8 @@ sparql_update_fast_send (DBusConnection     *connection,
 
 	if (pipe (pipefd) < 0) {
 		g_set_error (error,
-		             TRACKER_BUS_ERROR,
-		             TRACKER_BUS_ERROR_UNSUPPORTED,
+		             TRACKER_SPARQL_ERROR,
+		             TRACKER_SPARQL_ERROR_UNSUPPORTED,
 		             "Cannot open pipe");
 		return NULL;
 	}
@@ -270,8 +270,8 @@ sparql_update_fast_send (DBusConnection     *connection,
 
 	if (!call) {
 		g_set_error (error,
-		             TRACKER_BUS_ERROR,
-		             TRACKER_BUS_ERROR_UNSUPPORTED,
+		             TRACKER_SPARQL_ERROR,
+		             TRACKER_SPARQL_ERROR_UNSUPPORTED,
 		             "FD passing unsupported or connection disconnected");
 		return NULL;
 	}
@@ -484,8 +484,8 @@ tracker_bus_fd_sparql_update_blank (DBusGConnection *connection,
 
 	if (g_strcmp0 (dbus_message_get_signature (reply), "aaa{ss}")) {
 		g_set_error (error,
-		             TRACKER_BUS_ERROR,
-		             TRACKER_BUS_ERROR_UNSUPPORTED,
+		             TRACKER_SPARQL_ERROR,
+		             TRACKER_SPARQL_ERROR_UNSUPPORTED,
 		             "Server returned invalid results");
 		dbus_message_unref (reply);
 		return NULL;
diff --git a/src/libtracker-bus/tracker-bus-fd-update.vapi b/src/libtracker-bus/tracker-bus-fd-update.vapi
index 73d5c19..2546a56 100644
--- a/src/libtracker-bus/tracker-bus-fd-update.vapi
+++ b/src/libtracker-bus/tracker-bus-fd-update.vapi
@@ -21,10 +21,10 @@
  * http://git.gnome.org/browse/vala/commit/?id=7757cf9ecf6084413f409ba31c31ed73cacd6ec1*/
 
 [CCode (cheader_filename = "tracker-bus-fd-update.h")]
-public void tracker_bus_fd_sparql_update (DBus.Connection connection, string query) throws GLib.Error;
+public void tracker_bus_fd_sparql_update (DBus.Connection connection, string query) throws Tracker.Sparql.Error;
 [CCode (cheader_filename = "tracker-bus-fd-update.h")]
-public extern GLib.PtrArray tracker_bus_fd_sparql_update_blank (DBus.Connection connection, string query) throws GLib.Error;
+public extern GLib.PtrArray tracker_bus_fd_sparql_update_blank (DBus.Connection connection, string query) throws Tracker.Sparql.Error;
 [CCode (cheader_filename = "tracker-bus-fd-update.h")]
-public extern async void tracker_bus_fd_sparql_update_async (DBus.Connection connection, string query, GLib.Cancellable? cancellable = null) throws GLib.Error;
+public extern async void tracker_bus_fd_sparql_update_async (DBus.Connection connection, string query, GLib.Cancellable? cancellable = null) throws Tracker.Sparql.Error;
 [CCode (cheader_filename = "tracker-bus-fd-update.h")]
-public extern async uint tracker_bus_fd_sparql_update_blank_async (DBus.Connection connection, string query, GLib.Cancellable? cancellable = null) throws GLib.Error;
+public extern async uint tracker_bus_fd_sparql_update_blank_async (DBus.Connection connection, string query, GLib.Cancellable? cancellable = null) throws Tracker.Sparql.Error;
diff --git a/src/libtracker-bus/tracker-bus.vala b/src/libtracker-bus/tracker-bus.vala
index 21908c5..81a9ae5 100644
--- a/src/libtracker-bus/tracker-bus.vala
+++ b/src/libtracker-bus/tracker-bus.vala
@@ -44,10 +44,6 @@ private interface Tracker.Bus.Statistics : GLib.Object {
 // Imported DBus FD API until we have support with Vala
 public extern Tracker.Sparql.Cursor tracker_bus_fd_query (DBus.Connection connection, string query) throws Tracker.Sparql.Error;
 
-public errordomain Tracker.BusError {
-	UNSUPPORTED
-}
-
 // Actual class definition
 public class Tracker.Bus.Connection : Tracker.Sparql.Connection {
 	static DBus.Connection connection;