[gnome-builder/gnome-builder-3-18] build: more G-I fixes based on gregier suggestions

[Christian Hergert <chergert src gnome org>]

commit 09de01b2c3fe583ae4d4ff09ae8d050f3a8baf9e
Author: Christian Hergert <christian hergert me>
Date:   Tue Sep 29 20:12:34 2015 -0700

    build: more G-I fixes based on gregier suggestions

 contrib/egg/egg-signal-group.c  |    6 +++---
 contrib/egg/egg-state-machine.c |    4 ++--
 src/tree/gb-tree-node.c         |    2 +-
 src/workbench/gb-workbench.c    |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/contrib/egg/egg-signal-group.c b/contrib/egg/egg-signal-group.c
index 3407d8c..480dd29 100644
--- a/contrib/egg/egg-signal-group.c
+++ b/contrib/egg/egg-signal-group.c
@@ -676,9 +676,9 @@ egg_signal_group_connect_object (EggSignalGroup *self,
  * egg_signal_group_connect_data:
  * @self: a #EggSignalGroup
  * @detailed_signal: a string of the form "signal-name::detail"
- * @c_handler: (scope async): the #GCallback to connect
- * @data: (closure c_handler): the data to pass to @callback calls
- * @notify: (destroy data): function to be called when disposing of @self
+ * @c_handler: (scope async) (closure data) (destroy notify): the #GCallback to connect
+ * @data: the data to pass to @callback calls
+ * @notify: function to be called when disposing of @self
  * @flags: the flags used to create the signal connection
  *
  * Connects @callback to the signal @detailed_signal
diff --git a/contrib/egg/egg-state-machine.c b/contrib/egg/egg-state-machine.c
index 44ecfcf..1aad39f 100644
--- a/contrib/egg/egg-state-machine.c
+++ b/contrib/egg/egg-state-machine.c
@@ -709,8 +709,8 @@ egg_state_machine_add_style (EggStateMachine *self,
  * @state: The state the signal connection should exist within
  * @source: the source object to connect to
  * @detailed_signal: The detailed signal of @source to connect.
- * @callback: (scope async): The callback to execute upon signal emission.
- * @user_data: (closure callback): The user data for @callback.
+ * @callback: (scope async) (closure user_data): The callback to execute upon signal emission.
+ * @user_data: The user data for @callback.
  * @flags: signal connection flags.
  *
  * Connects to the @detailed_signal of @source only when the current
diff --git a/src/tree/gb-tree-node.c b/src/tree/gb-tree-node.c
index cba406f..1798291 100644
--- a/src/tree/gb-tree-node.c
+++ b/src/tree/gb-tree-node.c
@@ -128,7 +128,7 @@ _gb_tree_node_set_tree (GbTreeNode *node,
  * @node: A #GbTreeNode.
  * @child: A #GbTreeNode.
  * @compare_func: (scope call): A compare func to compare nodes.
- * @user_data: (closure compare_func): user data for @compare_func.
+ * @user_data: user data for @compare_func.
  *
  * Inserts a @child as a child of @node, sorting it among the other children.
  */
diff --git a/src/workbench/gb-workbench.c b/src/workbench/gb-workbench.c
index 1011b1d..1ba2ef7 100644
--- a/src/workbench/gb-workbench.c
+++ b/src/workbench/gb-workbench.c
@@ -1025,7 +1025,7 @@ gb_workbench_get_closing (GbWorkbench *self)
  * gb_workbench_views_foreach:
  * @self: A #GbWorkbench.
  * @callback: (scope call): A callback to call for each view.
- * @callback_data: (closure callback): User data for @callback.
+ * @callback_data: User data for @callback.
  *
  * Invoke @callback for each view in the workbench.
  */