[gtk+/wip/aruiz/nullable-annotations] nullable annotations: gtk_accel_group_query gtk_accel_group_from_accel_closure gtk_accel_label

[Alberto Ruiz <aruiz src gnome org>]

commit 585f37ee04bd8052c8991ee1f16d15d958844733
Author: Alberto Ruiz <aruiz gnome org>
Date:   Fri Aug 14 16:52:06 2015 +0100

    nullable annotations:
      gtk_accel_group_query
      gtk_accel_group_from_accel_closure
      gtk_accel_label_get_accel_widget
      gtk_entry_get_icon_name
      gtk_label_get_mnemonic_widget
      gtk_menu_item_get_accel_path
      gtk_places_sidebar_get_nth_bookmark
      gtk_text_view_get_tabs

 gtk/gtkaccelgroup.c    |    6 +++---
 gtk/gtkaccellabel.c    |    2 +-
 gtk/gtkentry.c         |    4 ++--
 gtk/gtklabel.c         |    2 +-
 gtk/gtkmenuitem.c      |    4 ++--
 gtk/gtkplacessidebar.c |    6 +++---
 gtk/gtktextview.c      |    4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c
index 0523efe..a42a77a 100644
--- a/gtk/gtkaccelgroup.c
+++ b/gtk/gtkaccelgroup.c
@@ -823,13 +823,13 @@ _gtk_accel_group_get_accelerables (GtkAccelGroup *accel_group)
  * @accel_group: the accelerator group to query
  * @accel_key: key value of the accelerator
  * @accel_mods: modifier combination of the accelerator
- * @n_entries: (out) (allow-none): location to return the number
+ * @n_entries: (out) (optional): location to return the number
  *     of entries found, or %NULL
  *
  * Queries an accelerator group for all entries matching @accel_key
  * and @accel_mods.
  *
- * Returns: (transfer none) (array length=n_entries): an array of
+ * Returns: (transfer none) (array length=n_entries) (nullable): an array of
  *     @n_entries #GtkAccelGroupEntry elements, or %NULL. The array
  *     is owned by GTK+ and must not be freed.
  */
@@ -859,7 +859,7 @@ gtk_accel_group_query (GtkAccelGroup   *accel_group,
  * Finds the #GtkAccelGroup to which @closure is connected;
  * see gtk_accel_group_connect().
  *
- * Returns: (transfer none): the #GtkAccelGroup to which @closure
+ * Returns: (nullable) (transfer none): the #GtkAccelGroup to which @closure
  *     is connected, or %NULL
  */
 GtkAccelGroup*
diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c
index 5289fa1..90d9865 100644
--- a/gtk/gtkaccellabel.c
+++ b/gtk/gtkaccellabel.c
@@ -317,7 +317,7 @@ gtk_accel_label_finalize (GObject *object)
  * Fetches the widget monitored by this accelerator label. See
  * gtk_accel_label_set_accel_widget().
  *
- * Returns: (transfer none): the object monitored by the accelerator label, or %NULL.
+ * Returns: (nullable) (transfer none): the object monitored by the accelerator label, or %NULL.
  **/
 GtkWidget*
 gtk_accel_label_get_accel_widget (GtkAccelLabel *accel_label)
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index a7d04fb..4909674 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -8943,8 +8943,8 @@ gtk_entry_get_icon_stock (GtkEntry             *entry,
  * no icon or if the icon was set by some other method (e.g., by
  * pixbuf, stock or gicon).
  *
- * Returns: An icon name, or %NULL if no icon is set or if the icon
- *          wasn’t set from an icon name
+ * Returns (nullable) (transfer none): An icon name, or %NULL if no icon is set
+ *     or if the icon wasn't set from an icon name
  *
  * Since: 2.16
  */
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index f3ab485..d68514a 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -2053,7 +2053,7 @@ gtk_label_set_mnemonic_widget (GtkLabel  *label,
  * Retrieves the target of the mnemonic (keyboard shortcut) of this
  * label. See gtk_label_set_mnemonic_widget().
  *
- * Returns: (transfer none): the target of the label’s mnemonic,
+ * Returns: (nullable) (transfer none): the target of the label’s mnemonic,
  *     or %NULL if none has been set and the default algorithm will be used.
  **/
 GtkWidget *
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index d025125..715bb11 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -2459,8 +2459,8 @@ gtk_menu_item_set_accel_path (GtkMenuItem *menu_item,
  *
  * See gtk_menu_item_set_accel_path() for details.
  *
- * Returns: the accelerator path corresponding to this menu
- *     item’s functionality, or %NULL if not set
+ * Returns (nullable) (transfer none): the accelerator path corresponding to
+ *     this menu item’s functionality, or %NULL if not set
  *
  * Since: 2.14
  */
diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
index 0e64cd4..96a4a2e 100644
--- a/gtk/gtkplacessidebar.c
+++ b/gtk/gtkplacessidebar.c
@@ -5012,9 +5012,9 @@ gtk_places_sidebar_list_shortcuts (GtkPlacesSidebar *sidebar)
  * and returns one of them.  This function is used by #GtkFileChooser to implement
  * the “Alt-1”, “Alt-2”, etc. shortcuts, which activate the cooresponding bookmark.
  *
- * Returns: (transfer full): The bookmark specified by the index @n, or
- * #NULL if no such index exist.  Note that the indices start at 0, even though
- * the file chooser starts them with the keyboard shortcut “Alt-1”.
+ * Returns: (nullable) (transfer full): The bookmark specified by the index @n, or
+ * %NULL if no such index exist.  Note that the indices start at 0, even though
+ * the file chooser starts them with the keyboard shortcut "Alt-1".
  *
  * Since: 3.10
  */
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index a1cca95..f689246 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -3139,8 +3139,8 @@ gtk_text_view_set_tabs (GtkTextView   *text_view,
  * “standard” (8-space) tabs are used. Free the return value
  * with pango_tab_array_free().
  * 
- * Returns: copy of default tab array, or %NULL if “standard” 
- *    tabs are used; must be freed with pango_tab_array_free().
+ * Returns (nullable) (transfer full): copy of default tab array, or %NULL if
+ *    “standard" tabs are used; must be freed with pango_tab_array_free().
  **/
 PangoTabArray*
 gtk_text_view_get_tabs (GtkTextView *text_view)