summaryrefslogtreecommitdiff
path: root/gtk/gtkaction.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/gtkaction.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/gtkaction.c')
-rw-r--r--gtk/gtkaction.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c
index 6e9dfa2557..48417a2bfc 100644
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@@ -978,8 +978,8 @@ gtk_action_disconnect_proxy (GtkAction *action,
*
* Returns the proxy widgets for an action.
* See also gtk_widget_get_action().
- *
- * Return value: a #GSList of proxy widgets. The list is owned by GTK+
+ *
+ * Return value: (element-type GtkWidget) (transfer none): a #GSList of proxy widgets. The list is owned by GTK+
* and must not be modified.
*
* Since: 2.4
@@ -1811,8 +1811,8 @@ gtk_action_get_accel_closure (GtkAction *action)
/**
* gtk_action_set_accel_group:
* @action: the action object
- * @accel_group: a #GtkAccelGroup or %NULL
- *
+ * @accel_group: (allow-none): a #GtkAccelGroup or %NULL
+ *
* Sets the #GtkAccelGroup in which the accelerator for this action
* will be installed.
*