From 5a8d012d296ab6eba4e26c59cfe06d3f8d582e70 Mon Sep 17 00:00:00 2001 From: Pavel Holejsovsky Date: Mon, 27 Dec 2010 16:08:46 +0100 Subject: [PATCH] Add GI annotations to GIcon and related classes and interfaces --- gio/gemblem.c | 6 +++--- gio/gemblemedicon.c | 4 ++-- gio/gicon.c | 4 ++-- gio/gloadableicon.c | 12 +++++++----- gio/gthemedicon.c | 2 +- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/gio/gemblem.c b/gio/gemblem.c index 68afbab76..1df712b6a 100644 --- a/gio/gemblem.c +++ b/gio/gemblem.c @@ -220,8 +220,8 @@ g_emblem_new_with_origin (GIcon *icon, * * Gives back the icon from @emblem. * - * Returns: (transfer full): a #GIcon. The returned object belongs to the emblem - * and should not be modified or freed. + * Returns: (transfer none): a #GIcon. The returned object belongs to + * the emblem and should not be modified or freed. * * Since: 2.18 */ @@ -240,7 +240,7 @@ g_emblem_get_icon (GEmblem *emblem) * * Gets the origin of the emblem. * - * Returns: the origin of the emblem + * Returns: (transfer none): the origin of the emblem * * Since: 2.18 */ diff --git a/gio/gemblemedicon.c b/gio/gemblemedicon.c index 89be5c320..6f7af0e46 100644 --- a/gio/gemblemedicon.c +++ b/gio/gemblemedicon.c @@ -201,8 +201,8 @@ g_emblemed_icon_get_icon (GEmblemedIcon *emblemed) * * Gets the list of emblems for the @icon. * - * Returns: (element-type utf8) (transfer none): a #GList of #GEmblem s that - * is owned by @emblemed + * Returns: (element-type Gio.Emblem) (transfer none): a #GList of + * #GEmblem s that is owned by @emblemed * * Since: 2.18 **/ diff --git a/gio/gicon.c b/gio/gicon.c index 115a3f5ff..c78acd362 100644 --- a/gio/gicon.c +++ b/gio/gicon.c @@ -397,8 +397,8 @@ ensure_builtin_icon_types (void) * implementations you need to ensure that each #GType is registered * with the type system prior to calling g_icon_new_for_string(). * - * Returns: An object implementing the #GIcon interface or %NULL if - * @error is set. + * Returns: (transfer full): An object implementing the #GIcon + * interface or %NULL if @error is set. * * Since: 2.20 **/ diff --git a/gio/gloadableicon.c b/gio/gloadableicon.c index 1cad7fc32..db86fd04e 100644 --- a/gio/gloadableicon.c +++ b/gio/gloadableicon.c @@ -62,8 +62,9 @@ g_loadable_icon_default_init (GLoadableIconIface *iface) * g_loadable_icon_load: * @icon: a #GLoadableIcon. * @size: an integer. - * @type: a location to store the type of the loaded icon, %NULL to ignore. - * @cancellable: optional #GCancellable object, %NULL to ignore. + * @type: (out) (allow-none): a location to store the type of the + * loaded icon, %NULL to ignore. + * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. * @error: a #GError location to store the error occuring, or %NULL to * ignore. * @@ -92,9 +93,10 @@ g_loadable_icon_load (GLoadableIcon *icon, * g_loadable_icon_load_async: * @icon: a #GLoadableIcon. * @size: an integer. - * @cancellable: optional #GCancellable object, %NULL to ignore. - * @callback: a #GAsyncReadyCallback to call when the request is satisfied - * @user_data: the data to pass to callback function + * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @callback: (scope async): a #GAsyncReadyCallback to call when the + * request is satisfied + * @user_data: (closure): the data to pass to callback function * * Loads an icon asynchronously. To finish this function, see * g_loadable_icon_load_finish(). For the synchronous, blocking diff --git a/gio/gthemedicon.c b/gio/gthemedicon.c index f6cde1570..e723a493e 100644 --- a/gio/gthemedicon.c +++ b/gio/gthemedicon.c @@ -275,7 +275,7 @@ g_themed_icon_new (const char *iconname) /** * g_themed_icon_new_from_names: - * @iconnames: an array of strings containing icon names. + * @iconnames: (array length=len): an array of strings containing icon names. * @len: the length of the @iconnames array, or -1 if @iconnames is * %NULL-terminated *