[tracker/direct-access-update-fd-passing] fix finish, squash

[Philip Van Hoof <pvanhoof src gnome org>]

commit f29464cc388b7901bcc80b0385cf6de818dfad9b
Author: Philip Van Hoof <philip codeminded be>
Date:   Wed Jul 21 14:21:34 2010 +0200

    fix finish, squash

 src/libtracker-bus/tracker-bus-fd-update.c    |   17 +++++++++++++++--
 src/libtracker-bus/tracker-bus-fd-update.h    |    3 ++-
 src/libtracker-bus/tracker-bus-fd-update.vapi |    4 ++--
 3 files changed, 19 insertions(+), 5 deletions(-)
---
diff --git a/src/libtracker-bus/tracker-bus-fd-update.c b/src/libtracker-bus/tracker-bus-fd-update.c
index 7325800..d7c5c21 100644
--- a/src/libtracker-bus/tracker-bus-fd-update.c
+++ b/src/libtracker-bus/tracker-bus-fd-update.c
@@ -423,9 +423,22 @@ tracker_bus_fd_sparql_update_async (DBusGConnection       *connection,
 #endif /* HAVE_DBUS_FD_PASSING */
 }
 
-void
-tracker_bus_fd_sparql_update_finish (GAsyncResult    *result)
+GPtrArray*
+tracker_bus_fd_sparql_update_finish (GAsyncResult     *res,
+                                     GError          **error)
 {
+#ifdef HAVE_DBUS_FD_PASSING
+	g_return_val_if_fail (res != NULL, NULL);
+
+	if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) {
+		return NULL;
+	}
+
+	return g_object_ref (g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res)));
+#else /* HAVE_DBUS_FD_PASSING */
+	g_assert_not_reached ();
+	return NULL;
+#endif /* HAVE_DBUS_FD_PASSING */
 }
 
 GPtrArray *
diff --git a/src/libtracker-bus/tracker-bus-fd-update.h b/src/libtracker-bus/tracker-bus-fd-update.h
index ac6ca15..720e75c 100644
--- a/src/libtracker-bus/tracker-bus-fd-update.h
+++ b/src/libtracker-bus/tracker-bus-fd-update.h
@@ -39,6 +39,7 @@ void        tracker_bus_fd_sparql_update_blank_async (DBusGConnection       *con
                                                       GCancellable          *cancellable,
                                                       GAsyncReadyCallback    callback,
                                                       gpointer               user_data);
-void        tracker_bus_fd_sparql_update_finish      (GAsyncResult          *result);
+GPtrArray*  tracker_bus_fd_sparql_update_finish      (GAsyncResult          *res,
+                                                      GError               **error);
 
 G_END_DECLS
diff --git a/src/libtracker-bus/tracker-bus-fd-update.vapi b/src/libtracker-bus/tracker-bus-fd-update.vapi
index 4ea2b1e..73d5c19 100644
--- a/src/libtracker-bus/tracker-bus-fd-update.vapi
+++ b/src/libtracker-bus/tracker-bus-fd-update.vapi
@@ -25,6 +25,6 @@ public void tracker_bus_fd_sparql_update (DBus.Connection connection, string que
 [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;
 [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);
+public extern async void tracker_bus_fd_sparql_update_async (DBus.Connection connection, string query, GLib.Cancellable? cancellable = null) throws GLib.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);
+public extern async uint tracker_bus_fd_sparql_update_blank_async (DBus.Connection connection, string query, GLib.Cancellable? cancellable = null) throws GLib.Error;