From 8620b30df9dfb20f28f0091e80704a62aae0bf5f Mon Sep 17 00:00:00 2001
From: Evan Nemerson <evan@coeus-group.com>
Date: Tue, 19 Jun 2012 16:09:10 -0700
Subject: [PATCH] introspection: rename some "data" arguments to "user_data"

GObject Introspection will automatically treat "user_data" arguments
as closure data.
---
 gst/gstbus.h        | 8 ++++----
 gst/gstinfo.h       | 4 ++--
 gst/gstminiobject.h | 4 ++--
 gst/gsttask.h       | 4 ++--
 gst/gsttaskpool.h   | 4 ++--
 gst/gsttypefind.h   | 4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/gst/gstbus.h b/gst/gstbus.h
index 2dbf0cef52..04d4d6cd08 100644
--- a/gst/gstbus.h
+++ b/gst/gstbus.h
@@ -72,7 +72,7 @@ typedef enum
  * GstBusSyncHandler:
  * @bus: the #GstBus that sent the message
  * @message: the #GstMessage
- * @data: user data that has been given, when registering the handler
+ * @user_data: user data that has been given, when registering the handler
  *
  * Handler will be invoked synchronously, when a new message has been injected
  * into the bus. This function is mostly used internally. Only one sync handler
@@ -83,13 +83,13 @@ typedef enum
  *
  * Returns: #GstBusSyncReply stating what to do with the message
  */
-typedef GstBusSyncReply (*GstBusSyncHandler)    (GstBus * bus, GstMessage * message, gpointer data);
+typedef GstBusSyncReply (*GstBusSyncHandler)    (GstBus * bus, GstMessage * message, gpointer user_data);
 
 /**
  * GstBusFunc:
  * @bus: the #GstBus that sent the message
  * @message: the #GstMessage
- * @data: user data that has been given, when registering the handler
+ * @user_data: user data that has been given, when registering the handler
  *
  * Specifies the type of function passed to gst_bus_add_watch() or
  * gst_bus_add_watch_full(), which is called from the mainloop when a message
@@ -103,7 +103,7 @@ typedef GstBusSyncReply (*GstBusSyncHandler)    (GstBus * bus, GstMessage * mess
  *
  * Returns: %FALSE if the event source should be removed.
  */
-typedef gboolean        (*GstBusFunc)           (GstBus * bus, GstMessage * message, gpointer data);
+typedef gboolean        (*GstBusFunc)           (GstBus * bus, GstMessage * message, gpointer user_data);
 
 /**
  * GstBus:
diff --git a/gst/gstinfo.h b/gst/gstinfo.h
index 5b8f87cf48..3c6f4ca926 100644
--- a/gst/gstinfo.h
+++ b/gst/gstinfo.h
@@ -241,7 +241,7 @@ typedef struct _GstDebugMessage GstDebugMessage;
  * @line: line number
  * @object: a #GObject
  * @message: the message
- * @data: user data for the log function
+ * @user_data: user data for the log function
  *
  * Function prototype for a logging function that can be registered with
  * gst_debug_add_log_function().
@@ -254,7 +254,7 @@ typedef void (*GstLogFunction)  (GstDebugCategory * category,
                                  gint               line,
                                  GObject          * object,
                                  GstDebugMessage  * message,
-                                 gpointer           data);
+                                 gpointer           user_data);
 
 #ifdef GST_USING_PRINTF_EXTENSION
 
diff --git a/gst/gstminiobject.h b/gst/gstminiobject.h
index 6ce108cebe..e9bc14bb1b 100644
--- a/gst/gstminiobject.h
+++ b/gst/gstminiobject.h
@@ -69,7 +69,7 @@ typedef void (*GstMiniObjectFreeFunction) (GstMiniObject *obj);
 
  /**
  * GstMiniObjectWeakNotify:
- * @data: data that was provided when the weak reference was established
+ * @user_data: data that was provided when the weak reference was established
  * @where_the_mini_object_was: the mini object being finalized
  *
  * A #GstMiniObjectWeakNotify function can be added to a mini object as a
@@ -80,7 +80,7 @@ typedef void (*GstMiniObjectFreeFunction) (GstMiniObject *obj);
  *
  * Since: 0.10.35
  */
-typedef void (*GstMiniObjectWeakNotify) (gpointer data,
+typedef void (*GstMiniObjectWeakNotify) (gpointer user_data,
     GstMiniObject * where_the_mini_object_was);
 
 /**
diff --git a/gst/gsttask.h b/gst/gsttask.h
index 5c1600ecfa..7f95d7751e 100644
--- a/gst/gsttask.h
+++ b/gst/gsttask.h
@@ -30,12 +30,12 @@ G_BEGIN_DECLS
 
 /**
  * GstTaskFunction:
- * @data: user data passed to the function
+ * @user_data: user data passed to the function
  *
  * A function that will repeatedly be called in the thread created by
  * a #GstTask.
  */
-typedef void         (*GstTaskFunction)          (void *data);
+typedef void         (*GstTaskFunction)          (void *user_data);
 
 /* --- standard type macros --- */
 #define GST_TYPE_TASK                   (gst_task_get_type ())
diff --git a/gst/gsttaskpool.h b/gst/gsttaskpool.h
index 6f2ac6694d..b02143c9c4 100644
--- a/gst/gsttaskpool.h
+++ b/gst/gsttaskpool.h
@@ -40,13 +40,13 @@ typedef struct _GstTaskPoolClass GstTaskPoolClass;
 
 /**
  * GstTaskPoolFunction:
- * @data: user data for the task function
+ * @user_data: user data for the task function
  *
  * Task function, see gst_task_pool_push().
  *
  * Since: 0.10.24
  */
-typedef void   (*GstTaskPoolFunction)          (void *data);
+typedef void   (*GstTaskPoolFunction)          (void *user_data);
 
 /**
  * GstTaskPool:
diff --git a/gst/gsttypefind.h b/gst/gsttypefind.h
index 9e66b6d88c..054803f1b6 100644
--- a/gst/gsttypefind.h
+++ b/gst/gsttypefind.h
@@ -36,11 +36,11 @@ typedef struct _GstTypeFind GstTypeFind;
 /**
  * GstTypeFindFunction:
  * @find: A #GstTypeFind structure
- * @data: optionnal data to pass to the function
+ * @user_data: optionnal data to pass to the function
  *
  * A function that will be called by typefinding.
  */
-typedef void (* GstTypeFindFunction) (GstTypeFind *find, gpointer data);
+typedef void (* GstTypeFindFunction) (GstTypeFind *find, gpointer user_data);
 
 /**
  * GstTypeFindProbability: