[tracker/direct-access: 111/158] libtracker-bus: More update fixes



commit c55a0fbd422f0d58101fa74671ed0980d33acd71
Author: Jürg Billeter <j bitron ch>
Date:   Thu Jul 22 12:29:25 2010 +0200

    libtracker-bus: More update fixes

 src/libtracker-bus/tracker-bus-fd-update.c |    9 ++-------
 src/libtracker-bus/tracker-bus-fd-update.h |    2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/src/libtracker-bus/tracker-bus-fd-update.c b/src/libtracker-bus/tracker-bus-fd-update.c
index bd753c8..49f6c28 100644
--- a/src/libtracker-bus/tracker-bus-fd-update.c
+++ b/src/libtracker-bus/tracker-bus-fd-update.c
@@ -431,21 +431,16 @@ tracker_bus_fd_sparql_update_async (DBusGConnection       *connection,
 #endif /* HAVE_DBUS_FD_PASSING */
 }
 
-GPtrArray*
+void
 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)));
+	g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error);
 #else /* HAVE_DBUS_FD_PASSING */
 	g_assert_not_reached ();
-	return NULL;
 #endif /* HAVE_DBUS_FD_PASSING */
 }
 
diff --git a/src/libtracker-bus/tracker-bus-fd-update.h b/src/libtracker-bus/tracker-bus-fd-update.h
index 97dffcf..21ccc3c 100644
--- a/src/libtracker-bus/tracker-bus-fd-update.h
+++ b/src/libtracker-bus/tracker-bus-fd-update.h
@@ -39,7 +39,7 @@ void        tracker_bus_fd_sparql_update_blank_async  (DBusGConnection       *co
                                                        GCancellable          *cancellable,
                                                        GAsyncReadyCallback    callback,
                                                        gpointer               user_data);
-GPtrArray*  tracker_bus_fd_sparql_update_finish       (GAsyncResult          *res,
+void        tracker_bus_fd_sparql_update_finish       (GAsyncResult          *res,
                                                        GError               **error);
 GPtrArray*  tracker_bus_fd_sparql_update_blank_finish (GAsyncResult          *res,
                                                        GError               **error);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]