[gtk+/wip/aruiz/nullable-annotations] nullable annotations: gtk_notebook_get_nth_page gtk_notebook_get_tab_label_text gtk_notebook_g

[Alberto Ruiz <aruiz src gnome org>]

commit 031f64d9a1925dbecd0f520f66142d027607ec98
Author: Alberto Ruiz <aruiz gnome org>
Date:   Sat Dec 12 17:56:09 2015 +0000

    nullable annotations:
      gtk_notebook_get_nth_page
      gtk_notebook_get_tab_label_text
      gtk_notebook_get_menu_label
      gtk_notebook_get_menu_label_text
      gtk_notebook_get_group_name
      gtk_notebook_get_action_widget

 gtk/gtknotebook.c |   31 +++++++++++++++----------------
 1 files changed, 15 insertions(+), 16 deletions(-)
---
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 9edb66c..019e3c2 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -7270,8 +7270,8 @@ gtk_notebook_get_current_page (GtkNotebook *notebook)
  *
  * Returns the child widget contained in page number @page_num.
  *
- * Returns: (transfer none): the child widget, or %NULL
- *     if @page_num is out of bounds
+ * Returns: (nullable) (transfer none): the child widget, or %NULL if @page_num
+ * is out of bounds
  */
 GtkWidget*
 gtk_notebook_get_nth_page (GtkNotebook *notebook,
@@ -7964,9 +7964,9 @@ gtk_notebook_set_tab_label_text (GtkNotebook *notebook,
  * Retrieves the text of the tab label for the page containing
  * @child.
  *
- * Returns: the text of the tab label, or %NULL if the
- *     tab label widget is not a #GtkLabel. The string is owned
- *     by the widget and must not be freed.
+ * Returns: (nullable): the text of the tab label, or %NULL if the tab label
+ * widget is not a #GtkLabel. The string is owned by the widget and must not be
+ * freed.
  */
 const gchar *
 gtk_notebook_get_tab_label_text (GtkNotebook *notebook,
@@ -7992,9 +7992,9 @@ gtk_notebook_get_tab_label_text (GtkNotebook *notebook,
  *
  * Retrieves the menu label widget of the page containing @child.
  *
- * Returns: (transfer none): the menu label, or %NULL if the
- *     notebook page does not have a menu label other than the
- *     default (the tab label).
+ * Returns: (nullable) (transfer none): the menu label, or %NULL if the
+ * notebook page does not have a menu label other than the default (the tab
+ * label).
  */
 GtkWidget*
 gtk_notebook_get_menu_label (GtkNotebook *notebook,
@@ -8101,10 +8101,10 @@ gtk_notebook_set_menu_label_text (GtkNotebook *notebook,
  * Retrieves the text of the menu label for the page containing
  * @child.
  *
- * Returns: the text of the tab label, or %NULL if the
- *     widget does not have a menu label other than the default
- *     menu label, or the menu label widget is not a #GtkLabel.
- *     The string is owned by the widget and must not be freed.
+ * Returns: (nullable): the text of the tab label, or %NULL if the widget does
+ * not have a menu label other than the default menu label, or the menu label
+ * widget is not a #GtkLabel. The string is owned by the widget and must not be
+ * freed.
  */
 const gchar *
 gtk_notebook_get_menu_label_text (GtkNotebook *notebook,
@@ -8317,8 +8317,7 @@ gtk_notebook_set_group_name (GtkNotebook *notebook,
  *
  * Gets the current group name for @notebook.
  *
- * Returns: (transfer none): the group name,
- *     or %NULL if none is set.
+ * Returns: (nullable) (transfer none): the group name, or %NULL if none is set
  *
  * Since: 2.24
  */
@@ -8501,8 +8500,8 @@ gtk_notebook_set_tab_detachable (GtkNotebook *notebook,
  *
  * Gets one of the action widgets. See gtk_notebook_set_action_widget().
  *
- * Returns: (transfer none): The action widget with the given @pack_type
- *     or %NULL when this action widget has not been set
+ * Returns: (nullable) (transfer none): The action widget with the given
+ * @pack_type or %NULL when this action widget has not been set
  *
  * Since: 2.20
  */