[gtk+/wip/aruiz/nullable-annotations] nullable annotations: gtk_cell_area_get_focus_from_sibling gtk_cell_renderer_start_editing gtk

[Alberto Ruiz <aruiz src gnome org>]

commit 5bf3d18c0406140ca7ba9d5f15adfd56cb3eea0b
Author: Alberto Ruiz <aruiz gnome org>
Date:   Wed Aug 19 02:59:16 2015 +0100

    nullable annotations:
      gtk_cell_area_get_focus_from_sibling
      gtk_cell_renderer_start_editing
      gtk_cell_view_get_displayed_row
      gtk_cell_view_get_model
      gtk_clipboard_get_owner
      gtk_container_get_focus_child
      gtk_container_get_focus_hadjustment
      gtk_container_get_focus_vadjustment
      gtk_dialog_get_widget_for_response
      gtk_entry_get_attributes
      gtk_entry_get_cursor_hadjustment
      gtk_entry_get_icon_gicon
      gtk_entry_get_icon_pixbuf

 gtk/gtkcellarea.c     |    2 +-
 gtk/gtkcellrenderer.c |    2 +-
 gtk/gtkcellview.c     |    4 ++--
 gtk/gtkclipboard.c    |    2 +-
 gtk/gtkcontainer.c    |    8 ++++----
 gtk/gtkdialog.c       |    2 +-
 gtk/gtkentry.c        |   10 +++++-----
 7 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/gtk/gtkcellarea.c b/gtk/gtkcellarea.c
index 6d85040..34a4cc3 100644
--- a/gtk/gtkcellarea.c
+++ b/gtk/gtkcellarea.c
@@ -3187,7 +3187,7 @@ gtk_cell_area_get_focus_siblings (GtkCellArea     *area,
  * then chose to activate the focus cell for which the event
  * cell may have been a sibling.
  *
- * Returns: (transfer none): the #GtkCellRenderer for which @renderer
+ * Returns: (nullable) (transfer none): the #GtkCellRenderer for which @renderer
  *    is a sibling, or %NULL.
  *
  * Since: 3.0
diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c
index adca3f7..fcb2d88 100644
--- a/gtk/gtkcellrenderer.c
+++ b/gtk/gtkcellrenderer.c
@@ -893,7 +893,7 @@ gtk_cell_renderer_activate (GtkCellRenderer      *cell,
  *
  * Passes an activate event to the cell renderer for possible processing.
  *
- * Returns: (transfer none): A new #GtkCellEditable, or %NULL
+ * Returns: (nullable) (transfer none): A new #GtkCellEditable, or %NULL
  **/
 GtkCellEditable *
 gtk_cell_renderer_start_editing (GtkCellRenderer      *cell,
diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index 0fc9811..51e1f12 100644
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -1209,7 +1209,7 @@ gtk_cell_view_set_model (GtkCellView  *cell_view,
  * Returns the model for @cell_view. If no model is used %NULL is
  * returned.
  *
- * Returns: (transfer none): a #GtkTreeModel used or %NULL
+ * Returns: (nullable) (transfer none): a #GtkTreeModel used or %NULL
  *
  * Since: 2.16
  **/
@@ -1266,7 +1266,7 @@ gtk_cell_view_set_displayed_row (GtkCellView *cell_view,
  * displayed row. If no row is currently displayed, 
  * %NULL is returned.
  *
- * Returns: the currently displayed row or %NULL
+ * Returns: (nullable) (transfer full): the currently displayed row or %NULL
  *
  * Since: 2.6
  */
diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c
index 2b0f99c..5f53d8c 100644
--- a/gtk/gtkclipboard.c
+++ b/gtk/gtkclipboard.c
@@ -737,7 +737,7 @@ gtk_clipboard_set_with_owner (GtkClipboard          *clipboard,
  * gtk_clipboard_clear() has not subsequently called, returns the owner set
  * by gtk_clipboard_set_with_owner().
  *
- * Returns: (transfer none): the owner of the clipboard, if any;
+ * Returns: (nullable) (transfer none): the owner of the clipboard, if any;
  *     otherwise %NULL.
  **/
 GObject *
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 2f51045..9d99629 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -2407,7 +2407,7 @@ gtk_container_set_focus_child (GtkContainer *container,
  * currently focused widget. That can be obtained by calling
  * gtk_window_get_focus().
  *
- * Returns: (transfer none): The child widget which will receive the
+ * Returns: (nullable) (transfer none): The child widget which will receive the
  *          focus inside @container when the @conatiner is focussed,
  *          or %NULL if none is set.
  *
@@ -3428,8 +3428,8 @@ gtk_container_set_focus_vadjustment (GtkContainer  *container,
  * Retrieves the vertical focus adjustment for the container. See
  * gtk_container_set_focus_vadjustment().
  *
- * Returns: (transfer none): the vertical focus adjustment, or %NULL if
- *   none has been set.
+ * Returns: (nullable) (transfer none): the vertical focus adjustment, or
+ *   %NULL if none has been set.
  **/
 GtkAdjustment *
 gtk_container_get_focus_vadjustment (GtkContainer *container)
@@ -3483,7 +3483,7 @@ gtk_container_set_focus_hadjustment (GtkContainer  *container,
  * Retrieves the horizontal focus adjustment for the container. See
  * gtk_container_set_focus_hadjustment ().
  *
- * Returns: (transfer none): the horizontal focus adjustment, or %NULL if
+ * Returns: (nullable) (transfer none): the horizontal focus adjustment, or %NULL if
  *   none has been set.
  **/
 GtkAdjustment *
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 21cc18b..2f40b86 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -1423,7 +1423,7 @@ gtk_dialog_run (GtkDialog *dialog)
  * Gets the widget button that uses the given response ID in the action area
  * of a dialog.
  *
- * Returns: (transfer none): the @widget button that uses the given
+ * Returns: (nullable) (transfer none): the @widget button that uses the given
  *     @response_id, or %NULL.
  *
  * Since: 2.20
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 92df6b7..9ae5c50 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -8833,7 +8833,7 @@ gtk_entry_get_icon_activatable (GtkEntry             *entry,
  * method will work regardless of whether the icon was set using a
  * #GdkPixbuf, a #GIcon, a stock item, or an icon name.
  *
- * Returns: (transfer none): A #GdkPixbuf, or %NULL if no icon is
+ * Returns: (nullable) (transfer none): A #GdkPixbuf, or %NULL if no icon is
  *     set for this position.
  *
  * Since: 2.16
@@ -8875,7 +8875,7 @@ gtk_entry_get_icon_pixbuf (GtkEntry             *entry,
  * no icon or if the icon was set by some other method (e.g., by
  * stock, pixbuf, or icon name).
  *
- * Returns: (transfer none): A #GIcon, or %NULL if no icon is set
+ * Returns: (nullable) (transfer none): A #GIcon, or %NULL if no icon is set
  *     or if the icon is not a #GIcon
  *
  * Since: 2.16
@@ -10584,8 +10584,8 @@ gtk_entry_set_cursor_hadjustment (GtkEntry      *entry,
  * Retrieves the horizontal cursor adjustment for the entry. 
  * See gtk_entry_set_cursor_hadjustment().
  *
- * Returns: (transfer none): the horizontal cursor adjustment, or %NULL
- *   if none has been set.
+ * Returns: (nullable) (transfer none): the horizontal cursor adjustment,
+ *   or %NULL if none has been set.
  *
  * Since: 2.12
  */
@@ -11110,7 +11110,7 @@ gtk_entry_set_attributes (GtkEntry      *entry,
  * Gets the attribute list that was set on the entry using
  * gtk_entry_set_attributes(), if any.
  *
- * Returns: (transfer none): the attribute list, or %NULL
+ * Returns: (nullable) (transfer none): the attribute list, or %NULL
  *     if none was set.
  *
  * Since: 3.6