[gnome-builder/gnome-builder-3-18] g-i: yet more gobject introspection cleanups

[Christian Hergert <chergert src gnome org>]

commit 80124bb6f04a2b3c9b076c6944cf4e4b2c31ed4d
Author: Christian Hergert <christian hergert me>
Date:   Tue Sep 29 20:37:48 2015 -0700

    g-i: yet more gobject introspection cleanups

 contrib/egg/egg-settings-sandwich.c |    6 +++---
 contrib/egg/egg-signal-group.c      |   14 +++++++-------
 contrib/egg/egg-state-machine.c     |    4 ++--
 libide/ide-settings.c               |    6 +++---
 libide/ide-symbol-resolver.c        |    2 +-
 libide/ide-thread-pool.c            |    2 +-
 6 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/contrib/egg/egg-settings-sandwich.c b/contrib/egg/egg-settings-sandwich.c
index 4af79d6..5e3d4c9 100644
--- a/contrib/egg/egg-settings-sandwich.c
+++ b/contrib/egg/egg-settings-sandwich.c
@@ -428,10 +428,10 @@ egg_settings_sandwich_bind (EggSettingsSandwich *self,
  * @object (type GObject.Object): the target object.
  * @property: the property on @object to apply.
  * @flags: flags for the binding.
- * @get_mapping: (scope async): the get mapping function
- * @set_mapping: (scope async): the set mapping function
+ * @get_mapping: (scope notified) (closure user_data) (destroy destroy): the get mapping function
+ * @set_mapping: (scope notified) (closure user_data) (destroy destroy): the set mapping function
  * @user_data: user data for @get_mapping and @set_mapping.
- * @destroy: (destroy user_data): destroy notify for @user_data.
+ * @destroy: destroy notify for @user_data.
  *
  * Creates a new binding similar to g_settings_bind_with_mapping() but applying
  * from the resolved value via the settings sandwich.
diff --git a/contrib/egg/egg-signal-group.c b/contrib/egg/egg-signal-group.c
index 480dd29..25cc93f 100644
--- a/contrib/egg/egg-signal-group.c
+++ b/contrib/egg/egg-signal-group.c
@@ -644,10 +644,10 @@ egg_signal_group_connect_full (EggSignalGroup *self,
 }
 
 /**
- * egg_signal_group_connect_object:
+ * egg_signal_group_connect_object: (skip)
  * @self: a #EggSignalGroup
  * @detailed_signal: a string of the form "signal-name::detail"
- * @c_handler: (scope async): the #GCallback to connect
+ * @c_handler: (scope notified): the #GCallback to connect
  * @object: the #GObject to pass as data to @callback calls
  *
  * Connects @callback to the signal @detailed_signal
@@ -676,7 +676,7 @@ 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) (closure data) (destroy notify): the #GCallback to connect
+ * @c_handler: (scope notified) (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
@@ -699,10 +699,10 @@ egg_signal_group_connect_data (EggSignalGroup *self,
 }
 
 /**
- * egg_signal_group_connect:
+ * egg_signal_group_connect: (skip)
  * @self: a #EggSignalGroup
  * @detailed_signal: a string of the form "signal-name::detail"
- * @c_handler: (scope async): the #GCallback to connect
+ * @c_handler: (scope notified): the #GCallback to connect
  * @data: the data to pass to @callback calls
  *
  * Connects @callback to the signal @detailed_signal
@@ -721,10 +721,10 @@ egg_signal_group_connect (EggSignalGroup *self,
 }
 
 /**
- * egg_signal_group_connect_after:
+ * egg_signal_group_connect_after: (skip)
  * @self: a #EggSignalGroup
  * @detailed_signal: a string of the form "signal-name::detail"
- * @c_handler: (scope async): the #GCallback to connect
+ * @c_handler: (scope notified): the #GCallback to connect
  * @data: the data to pass to @callback calls
  *
  * Connects @callback to the signal @detailed_signal
diff --git a/contrib/egg/egg-state-machine.c b/contrib/egg/egg-state-machine.c
index 1aad39f..36c2f96 100644
--- a/contrib/egg/egg-state-machine.c
+++ b/contrib/egg/egg-state-machine.c
@@ -704,12 +704,12 @@ egg_state_machine_add_style (EggStateMachine *self,
 }
 
 /**
- * egg_state_machine_connect_object:
+ * egg_state_machine_connect_object: (skip)
  * @self: A #EggStateMachine.
  * @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) (closure user_data): The callback to execute upon signal emission.
+ * @callback: (scope notified) (closure user_data): The callback to execute upon signal emission.
  * @user_data: The user data for @callback.
  * @flags: signal connection flags.
  *
diff --git a/libide/ide-settings.c b/libide/ide-settings.c
index 3dbc339..176603b 100644
--- a/libide/ide-settings.c
+++ b/libide/ide-settings.c
@@ -533,10 +533,10 @@ ide_settings_bind (IdeSettings        *self,
  * @object: the object to bind to
  * @property: the property of @object to bind to
  * @flags: flags for the binding
- * @get_mapping: (allow-none) (scope async): variant to value mapping
- * @set_mapping: (allow-none) (scope async): value to variant mapping
+ * @get_mapping: (allow-none) (scope notified): variant to value mapping
+ * @set_mapping: (allow-none) (scope notified): value to variant mapping
  * @user_data: user data for @get_mapping and @set_mapping
- * @destroy: (scope async): destroy function to cleanup @user_data.
+ * @destroy: destroy function to cleanup @user_data.
  *
  * Like ide_settings_bind() but allows transforming to and from settings storage using
  * @get_mapping and @set_mapping transformation functions.
diff --git a/libide/ide-symbol-resolver.c b/libide/ide-symbol-resolver.c
index cbe3063..c5a2c7d 100644
--- a/libide/ide-symbol-resolver.c
+++ b/libide/ide-symbol-resolver.c
@@ -40,7 +40,7 @@ ide_symbol_resolver_default_init (IdeSymbolResolverInterface *iface)
  * @self: An #IdeSymbolResolver.
  * @location: An #IdeSourceLocation.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: (scope async): A callback to execute upon completion.
+ * @callback: A callback to execute upon completion.
  * @user_data: user data for @callback.
  *
  * Asynchronously requests that @self determine the symbol existing at the source location
diff --git a/libide/ide-thread-pool.c b/libide/ide-thread-pool.c
index 173c248..5010712 100644
--- a/libide/ide-thread-pool.c
+++ b/libide/ide-thread-pool.c
@@ -109,7 +109,7 @@ ide_thread_pool_push_task (IdeThreadPoolKind  kind,
  * ide_thread_pool_push:
  * @kind: the threadpool kind to use.
  * @func: (scope async) (closure func_data): A function to call in the worker thread.
- * @func_data: (transfer full): user data for @func.
+ * @func_data: user data for @func.
  *
  * Runs the callback on the thread pool thread.
  */