[gtk+/wip/aruiz/nullable-annotations] nullable annotations: gtk_frame_get_label gtk_gl_area_get_error gtk_gesture_get_device gtk_g

[Alberto Ruiz <aruiz src gnome org>]

commit 590783be64b523af88b98fdad83129cf9cc32058
Author: Alberto Ruiz <aruiz gnome org>
Date:   Sat Dec 12 18:43:10 2015 +0000

    nullable annotations:
      gtk_frame_get_label
      gtk_gl_area_get_error
      gtk_gesture_get_device
      gtk_gesture_get_window
      gtk_grid_get_child_at

 gtk/gtkframe.c   |    2 +-
 gtk/gtkgesture.c |    4 ++--
 gtk/gtkglarea.c  |    2 +-
 gtk/gtkgrid.c    |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
index 421b051..7bbf019 100644
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -404,7 +404,7 @@ gtk_frame_set_label (GtkFrame *frame,
  * for the label widget if a non-%NULL argument was passed
  * to gtk_frame_new().)
  * 
- * Returns: the text in the label, or %NULL if there
+ * Returns: (nullable): the text in the label, or %NULL if there
  *               was no label widget or the lable widget was not
  *               a #GtkLabel. This string is owned by GTK+ and
  *               must not be modified or freed.
diff --git a/gtk/gtkgesture.c b/gtk/gtkgesture.c
index 15111c5..66614ef 100644
--- a/gtk/gtkgesture.c
+++ b/gtk/gtkgesture.c
@@ -839,7 +839,7 @@ gtk_gesture_init (GtkGesture *gesture)
  * Returns the master #GdkDevice that is currently operating
  * on @gesture, or %NULL if the gesture is not being interacted.
  *
- * Returns: (transfer none) (allow-none): a #GdkDevice, or %NULL
+ * Returns: (transfer none) (nullable): a #GdkDevice, or %NULL
  *
  * Since: 3.14
  **/
@@ -1386,7 +1386,7 @@ _gtk_gesture_cancel_sequence (GtkGesture       *gesture,
  * handled by @gesture. See gtk_gesture_set_window() for more
  * information.
  *
- * Returns: (transfer none) (allow-none): the user defined window, or %NULL if none
+ * Returns: (transfer none) (nullable): the user defined window, or %NULL if none
  *
  * Since: 3.14
  **/
diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c
index 5cf8bf2..d85c3c0 100644
--- a/gtk/gtkglarea.c
+++ b/gtk/gtkglarea.c
@@ -998,7 +998,7 @@ gtk_gl_area_set_error (GtkGLArea    *area,
  *
  * Gets the current error set on the @area.
  *
- * Returns: (transfer none): the #GError or %NULL
+ * Returns: (transfer none) (nullable): the #GError or %NULL
  *
  * Since: 3.16
  */
diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c
index 1b821b2..71f68c8 100644
--- a/gtk/gtkgrid.c
+++ b/gtk/gtkgrid.c
@@ -1946,7 +1946,7 @@ gtk_grid_attach_next_to (GtkGrid         *grid,
  * Gets the child of @grid whose area covers the grid
  * cell whose upper left corner is at @left, @top.
  *
- * Returns: (transfer none): the child at the given position, or %NULL
+ * Returns: (transfer none) (nullable): the child at the given position, or %NULL
  *
  * Since: 3.2
  */