summaryrefslogtreecommitdiff
path: root/gtk/gtkiconfactory.c
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2009-12-10 08:23:40 -0200
committerJohan Dahlin <johan@gnome.org>2009-12-16 17:22:01 -0200
commit6529c07614ebfbfac73f526efb057d8a8e3a7354 (patch)
tree6470d8b8af29900905a07ff7838d180cec8fd36e /gtk/gtkiconfactory.c
parentb3c48a4501d77c15ae236f1fe4514cc02de187f3 (diff)
downloadgtk+-6529c07614ebfbfac73f526efb057d8a8e3a7354.tar.gz
[introspection] Merge in Gtk-custom.c annotations
The Gtk-custom.c file in gir-repository contained a number of introspection annotations. Merge those into the GTK source files. Some documentation was moved from the tmpl/ files to accomodate the addition of annotations.
Diffstat (limited to 'gtk/gtkiconfactory.c')
-rw-r--r--gtk/gtkiconfactory.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index 145d935e8e..906a757656 100644
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -1620,7 +1620,7 @@ render_fallback_image (GtkStyle *style,
/**
* gtk_icon_set_render_icon:
* @icon_set: a #GtkIconSet
- * @style: a #GtkStyle associated with @widget, or %NULL
+ * @style: (allow-none): a #GtkStyle associated with @widget, or %NULL
* @direction: text direction
* @state: widget state
* @size: icon size. A size of (GtkIconSize)-1
@@ -1762,7 +1762,7 @@ gtk_icon_set_add_source (GtkIconSet *icon_set,
/**
* gtk_icon_set_get_sizes:
* @icon_set: a #GtkIconSet
- * @sizes: return location for array of sizes
+ * @sizes: (array length=n_sizes) (out): return location for array of sizes
* @n_sizes: location to store number of elements in returned array
*
* Obtains a list of icon sizes this icon set can render. The returned
@@ -2033,7 +2033,7 @@ gtk_icon_source_set_filename (GtkIconSource *source,
/**
* gtk_icon_source_set_icon_name
* @source: a #GtkIconSource
- * @icon_name: name of icon to use
+ * @icon_name: (allow-none): name of icon to use
*
* Sets the name of an icon to look up in the current icon theme
* to use as a base image when creating icon variants for #GtkIconSet.