Revert "Rename all user datas in callbacks to user_data"

This reverts commit 1422e5f81241650c634413911e92d23495692545. The renaming of parameters implicitly introduced "closure" annotations in the documentation which are wrong on callbacks.

3 files changed, 13 insertions, 13 deletions

diff --git a/glib/goption.h b/glib/goption.h
index 6d7de3ae5..739311f6e 100644
--- a/glib/goption.h
+++ b/glib/goption.h
@@ -138,8 +138,8 @@ typedef enum
  *  single dash followed by a single letter (for a short name) or two dashes
  *  followed by a long option name.
  * @value: The value to be parsed.
- * @user_data: User data added to the #GOptionGroup containing the option when
- *  it was created with g_option_group_new()
+ * @data: User data added to the #GOptionGroup containing the option when it
+ *  was created with g_option_group_new()
  * @error: A return location for errors. The error code %G_OPTION_ERROR_FAILED
  *  is intended to be used for errors in #GOptionArgFunc callbacks.
  * 
@@ -151,15 +151,15 @@ typedef enum
  */
 typedef gboolean (*GOptionArgFunc) (const gchar    *option_name,
 				    const gchar    *value,
-				    gpointer        user_data,
+				    gpointer        data,
 				    GError        **error);
 
 /**
  * GOptionParseFunc:
  * @context: The active #GOptionContext
  * @group: The group to which the function belongs
- * @user_data: User data added to the #GOptionGroup containing the option when
- *  it was created with g_option_group_new()
+ * @data: User data added to the #GOptionGroup containing the option when it
+ *  was created with g_option_group_new()
  * @error: A return location for error details
  * 
  * The type of function that can be called before and after parsing. 
@@ -169,22 +169,22 @@ typedef gboolean (*GOptionArgFunc) (const gchar    *option_name,
  */
 typedef gboolean (*GOptionParseFunc) (GOptionContext *context,
 				      GOptionGroup   *group,
-				      gpointer	      user_data,
+				      gpointer	      data,
 				      GError        **error);
 
 /**
  * GOptionErrorFunc:
  * @context: The active #GOptionContext
  * @group: The group to which the function belongs
- * @user_data: User data added to the #GOptionGroup containing the option when
- *  it was created with g_option_group_new()
+ * @data: User data added to the #GOptionGroup containing the option when it
+ *  was created with g_option_group_new()
  * @error: The #GError containing details about the parse error
  * 
  * The type of function to be used as callback when a parse error occurs.
  */
 typedef void (*GOptionErrorFunc) (GOptionContext *context,
 				  GOptionGroup   *group,
-				  gpointer        user_data,
+				  gpointer        data,
 				  GError        **error);
 
 /**
diff --git a/glib/gtree.h b/glib/gtree.h
index 27c6f29a5..74ab9ce95 100644
--- a/glib/gtree.h
+++ b/glib/gtree.h
@@ -55,7 +55,7 @@ typedef gboolean (*GTraverseFunc) (gpointer  key,
 /**
  * GTraverseNodeFunc:
  * @node: a #GTreeNode
- * @user_data: user data passed to g_tree_foreach_node()
+ * @data: user data passed to g_tree_foreach_node()
  *
  * Specifies the type of function passed to g_tree_foreach_node(). It is
  * passed each node, together with the @user_data parameter passed to
@@ -66,7 +66,7 @@ typedef gboolean (*GTraverseFunc) (gpointer  key,
  * Since: 2.68
  */
 typedef gboolean (*GTraverseNodeFunc) (GTreeNode *node,
-                                       gpointer   user_data);
+                                       gpointer   data);
 
 /* Balanced binary trees
  */
diff --git a/glib/gtypes.h b/glib/gtypes.h
index d0e89b482..9d68f93a7 100644
--- a/glib/gtypes.h
+++ b/glib/gtypes.h
@@ -172,7 +172,7 @@ typedef void            (*GFreeFunc)            (gpointer       data);
 /**
  * GTranslateFunc:
  * @str: the untranslated string
- * @user_data: user data specified when installing the function, e.g.
+ * @data: user data specified when installing the function, e.g.
  *  in g_option_group_set_translate_func()
  * 
  * The type of functions which are used to translate user-visible
@@ -182,7 +182,7 @@ typedef void            (*GFreeFunc)            (gpointer       data);
  *  The returned string is owned by GLib and must not be freed.
  */
 typedef const gchar *   (*GTranslateFunc)       (const gchar   *str,
-						 gpointer       user_data);
+						 gpointer       data);
 
 
 /* Define some mathematical constants that aren't available