[tracker/extractor-dbus-fd: 8/11] libtracker-common: Rename callback, prefix DBus in name

[Martyn James Russell <mr src gnome org>]

commit 7c01129228e6b6b916ede6df5dd31f9d4303f62f
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Jul 7 14:41:43 2010 +0100

    libtracker-common: Rename callback, prefix DBus in name

 src/libtracker-common/tracker-dbus.c |   26 +++++++++++++-------------
 src/libtracker-common/tracker-dbus.h |   30 ++++++++++++++++--------------
 2 files changed, 29 insertions(+), 27 deletions(-)
---
diff --git a/src/libtracker-common/tracker-dbus.c b/src/libtracker-common/tracker-dbus.c
index 31a7f97..f7a907e 100644
--- a/src/libtracker-common/tracker-dbus.c
+++ b/src/libtracker-common/tracker-dbus.c
@@ -54,7 +54,7 @@ typedef struct {
 	GInputStream *buffered_input_stream;
 	GOutputStream *output_stream;
 	DBusPendingCall *call;
-	TrackerSendAndSpliceCallback callback;
+	TrackerDBusSendAndSpliceCallback callback;
 	gpointer user_data;
 } SendAndSpliceData;
 
@@ -803,12 +803,12 @@ tracker_dbus_send_and_splice (DBusConnection  *connection,
 }
 
 static SendAndSpliceData*
-send_and_splice_data_new (GInputStream                 *unix_input_stream,
-                          GInputStream                 *buffered_input_stream,
-                          GOutputStream                *output_stream,
-						  DBusPendingCall              *call,
-						  TrackerSendAndSpliceCallback  callback,
-						  gpointer                      user_data)
+send_and_splice_data_new (GInputStream                     *unix_input_stream,
+                          GInputStream                     *buffered_input_stream,
+                          GOutputStream                    *output_stream,
+                          DBusPendingCall                  *call,
+                          TrackerDBusSendAndSpliceCallback  callback,
+                          gpointer                          user_data)
 {
 	SendAndSpliceData *data;
 
@@ -881,12 +881,12 @@ send_and_splice_async_callback (GObject      *source,
 }
 
 void
-tracker_dbus_send_and_splice_async (DBusConnection               *connection,
-                                    DBusMessage                  *message,
-                                    int                           fd,
-                                    GCancellable                 *cancellable,
-                                    TrackerSendAndSpliceCallback  callback,
-                                    gpointer                      user_data)
+tracker_dbus_send_and_splice_async (DBusConnection                   *connection,
+                                    DBusMessage                      *message,
+                                    int                               fd,
+                                    GCancellable                     *cancellable,
+                                    TrackerDBusSendAndSpliceCallback  callback,
+                                    gpointer                          user_data)
 {
 	DBusPendingCall *call;
 	GInputStream *unix_input_stream;
diff --git a/src/libtracker-common/tracker-dbus.h b/src/libtracker-common/tracker-dbus.h
index 68128c4..b4ab087 100644
--- a/src/libtracker-common/tracker-dbus.h
+++ b/src/libtracker-common/tracker-dbus.h
@@ -92,10 +92,10 @@ typedef struct TrackerDBusRequestHandler TrackerDBusRequestHandler;
 typedef void (*TrackerDBusRequestFunc) (guint    request_id,
                                         gpointer user_data);
 
-typedef void (*TrackerSendAndSpliceCallback) (void     *buffer,
-                                              gssize    buffer_size,
-                                              GError   *error,
-                                              gpointer  user_data);
+typedef void (*TrackerDBusSendAndSpliceCallback) (void     *buffer,
+                                                  gssize    buffer_size,
+                                                  GError   *error,
+                                                  gpointer  user_data);
 
 typedef struct {
 	guint    id;
@@ -128,15 +128,15 @@ gchar **         tracker_dbus_queue_str_to_strv      (GQueue
                                                       gint                        max);
 gchar **         tracker_dbus_queue_gfile_to_strv    (GQueue                     *queue,
                                                       gint                        max);
-void             tracker_dbus_results_ptr_array_free (GPtrArray                         **ptr_array);
+void             tracker_dbus_results_ptr_array_free (GPtrArray                 **ptr_array);
 
 /* Requests */
 guint            tracker_dbus_get_next_request_id    (void);
 
 TrackerDBusRequestHandler *
-tracker_dbus_request_add_hook       (TrackerDBusRequestFunc      new,
-                                     TrackerDBusRequestFunc      done,
-                                     gpointer                    user_data);
+                 tracker_dbus_request_add_hook       (TrackerDBusRequestFunc      new,
+                                                      TrackerDBusRequestFunc      done,
+                                                      gpointer                    user_data);
 void             tracker_dbus_request_remove_hook    (TrackerDBusRequestHandler  *handler);
 
 void             tracker_dbus_request_new            (gint                        request_id,
@@ -166,6 +166,8 @@ void             tracker_dbus_request_block_hooks    (void);
 void             tracker_dbus_request_unblock_hooks  (void);
 
 void             tracker_dbus_enable_client_lookup   (gboolean                    enable);
+
+/* File descriptor convenience API */
 gboolean         tracker_dbus_send_and_splice        (DBusConnection             *connection,
                                                       DBusMessage                *message,
                                                       int                         fd,
@@ -174,12 +176,12 @@ gboolean         tracker_dbus_send_and_splice        (DBusConnection
                                                       gssize                     *dest_buffer_size,
                                                       GError                    **error);
 
-void             tracker_dbus_send_and_splice_async  (DBusConnection               *connection,
-                                                      DBusMessage                  *message,
-                                                      int                           fd,
-                                                      GCancellable                 *cancellable,
-                                                      TrackerSendAndSpliceCallback  callback,
-                                                      gpointer                      user_data);
+void             tracker_dbus_send_and_splice_async  (DBusConnection             *connection,
+                                                      DBusMessage                *message,
+                                                      int                         fd,
+                                                      GCancellable               *cancellable,
+                                                      TrackerDBusSendAndSpliceCallback callback,
+                                                      gpointer                    user_data);
 
 G_END_DECLS