From 904bc272500b804e7868f7233883604d5778d133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torsten=20Sch=C3=B6nfeld?= Date: Fri, 6 Dec 2013 23:53:41 +0100 Subject: [PATCH] gtkradio*: add (allow-none) annotations were appropriate https://bugzilla.gnome.org/show_bug.cgi?id=679563 --- gtk/deprecated/gtkradioaction.c | 2 +- gtk/gtkradiobutton.c | 6 +++--- gtk/gtkradiomenuitem.c | 12 +++++++----- gtk/gtkradiotoolbutton.c | 4 ++-- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/gtk/deprecated/gtkradioaction.c b/gtk/deprecated/gtkradioaction.c index 6b3c657fc2..94bb219cf6 100644 --- a/gtk/deprecated/gtkradioaction.c +++ b/gtk/deprecated/gtkradioaction.c @@ -432,7 +432,7 @@ gtk_radio_action_get_group (GtkRadioAction *action) /** * gtk_radio_action_set_group: * @action: the action object - * @group: (element-type GtkRadioAction): a list representing a radio group + * @group: (element-type GtkRadioAction) (allow-none): a list representing a radio group, or %NULL * * Sets the radio group for the radio action object. * diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c index b4f375cffb..5232ce479e 100644 --- a/gtk/gtkradiobutton.c +++ b/gtk/gtkradiobutton.c @@ -264,8 +264,8 @@ gtk_radio_button_get_property (GObject *object, /** * gtk_radio_button_set_group: * @radio_button: a #GtkRadioButton. - * @group: (transfer none) (element-type GtkRadioButton): an existing radio - * button group, such as one returned from gtk_radio_button_get_group(). + * @group: (element-type GtkRadioButton) (allow-none): an existing radio + * button group, such as one returned from gtk_radio_button_get_group(), or %NULL. * * Sets a #GtkRadioButton's group. It should be noted that this does not change * the layout of your interface in any way, so if you are changing the group, @@ -449,7 +449,7 @@ gtk_radio_button_new_with_label (GSList *group, /** * gtk_radio_button_new_with_mnemonic: * @group: (element-type GtkRadioButton) (allow-none): the radio button - * group + * group, or %NULL * @label: the text of the button, with an underscore in front of the * mnemonic character * diff --git a/gtk/gtkradiomenuitem.c b/gtk/gtkradiomenuitem.c index 122d7d2f26..607579bab7 100644 --- a/gtk/gtkradiomenuitem.c +++ b/gtk/gtkradiomenuitem.c @@ -93,8 +93,8 @@ G_DEFINE_TYPE_WITH_PRIVATE (GtkRadioMenuItem, gtk_radio_menu_item, GTK_TYPE_CHEC /** * gtk_radio_menu_item_new: - * @group: (element-type GtkRadioMenuItem): the group to which the - * radio menu item is to be attached + * @group: (element-type GtkRadioMenuItem) (allow-none): the group to which the + * radio menu item is to be attached, or %NULL * * Creates a new #GtkRadioMenuItem. * @@ -155,7 +155,7 @@ gtk_radio_menu_item_get_property (GObject *object, /** * gtk_radio_menu_item_set_group: * @radio_menu_item: a #GtkRadioMenuItem. - * @group: (element-type GtkRadioMenuItem): the new group. + * @group: (element-type GtkRadioMenuItem) (allow-none): the new group, or %NULL. * * Sets the group of a radio menu item, or changes it. */ @@ -237,7 +237,8 @@ gtk_radio_menu_item_set_group (GtkRadioMenuItem *radio_menu_item, /** * gtk_radio_menu_item_new_with_label: - * @group: (element-type GtkRadioMenuItem) (transfer full): + * @group: (element-type GtkRadioMenuItem) (allow-none): + * group the radio menu item is inside, or %NULL * @label: the text for the label * * Creates a new #GtkRadioMenuItem whose child is a simple #GtkLabel. @@ -257,7 +258,8 @@ gtk_radio_menu_item_new_with_label (GSList *group, /** * gtk_radio_menu_item_new_with_mnemonic: - * @group: (element-type GtkRadioMenuItem): group the radio menu item is inside + * @group: (element-type GtkRadioMenuItem) (allow-none): + * group the radio menu item is inside, or %NULL * @label: the text of the button, with an underscore in front of the * mnemonic character * diff --git a/gtk/gtkradiotoolbutton.c b/gtk/gtkradiotoolbutton.c index 40ef6241c5..60d0d4a171 100644 --- a/gtk/gtkradiotoolbutton.c +++ b/gtk/gtkradiotoolbutton.c @@ -124,7 +124,7 @@ gtk_radio_tool_button_set_property (GObject *object, /** * gtk_radio_tool_button_new: - * @group: (allow-none) (transfer none) (element-type GtkRadioButton): An + * @group: (allow-none) (element-type GtkRadioButton): An * existing radio button group, or %NULL if you are creating a new group * * Creates a new #GtkRadioToolButton, adding it to @group. @@ -264,7 +264,7 @@ gtk_radio_tool_button_get_group (GtkRadioToolButton *button) /** * gtk_radio_tool_button_set_group: * @button: a #GtkRadioToolButton - * @group: (transfer none) (element-type GtkRadioButton): an existing radio button group + * @group: (element-type GtkRadioButton) (allow-none): an existing radio button group, or %NULL * * Adds @button to @group, removing it from the group it belonged to before. *