[gtk+/wip/aruiz/nullable-annotations] nullable annotations: gtk_drag_dest_get_target_list gtk_drag_source_get_target_list gtk_widget

[Alberto Ruiz <aruiz src gnome org>]

commit 5d2856b266541c5c5066ac3ffdc6f4dc6c0503a3
Author: Alberto Ruiz <aruiz gnome org>
Date:   Sun Dec 13 04:27:56 2015 +0000

    nullable annotations:
      gtk_drag_dest_get_target_list
      gtk_drag_source_get_target_list
      gtk_widget_get_ancestor
      gtk_widget_get_font_map
      gtk_widget_get_font_options
      gtk_widget_get_frame_clock
      gtk_widget_get_parent
      gtk_widget_get_tooltip_markup
      gtk_widget_get_tooltip_text

 gtk/gtkdnd.c    |    4 ++--
 gtk/gtkwidget.c |   20 +++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index ba0ff76..412768d 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -1406,7 +1406,7 @@ gtk_drag_dest_unset (GtkWidget *widget)
  * Returns the list of targets this widget can accept from
  * drag-and-drop.
  * 
- * Returns: (transfer none): the #GtkTargetList, or %NULL if none
+ * Returns: (nullable) (transfer none): the #GtkTargetList, or %NULL if none
  */
 GtkTargetList*
 gtk_drag_dest_get_target_list (GtkWidget *widget)
@@ -2769,7 +2769,7 @@ gtk_drag_source_unset (GtkWidget *widget)
  * Gets the list of targets this widget can provide for
  * drag-and-drop.
  *
- * Returns: (transfer none): the #GtkTargetList, or %NULL if none
+ * Returns: (nullable) (transfer none): the #GtkTargetList, or %NULL if none
  *
  * Since: 2.4
  */
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 2f3b142..cfeec90 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -5811,7 +5811,8 @@ gtk_widget_queue_resize_no_redraw (GtkWidget *widget)
  *
  * Unrealized widgets do not have a frame clock.
  *
- * Returns: (transfer none): a #GdkFrameClock (or #NULL if widget is unrealized)
+ * Returns: (nullable) (transfer none): a #GdkFrameClock,
+ * or #NULL if widget is unrealized
  *
  * Since: 3.8
  */
@@ -9616,7 +9617,7 @@ gtk_widget_set_parent (GtkWidget *widget,
  *
  * Returns the parent container of @widget.
  *
- * Returns: (transfer none): the parent container of @widget, or %NULL
+ * Returns: (nullable) (transfer none): the parent container of @widget, or %NULL
  **/
 GtkWidget *
 gtk_widget_get_parent (GtkWidget *widget)
@@ -10417,7 +10418,7 @@ gtk_widget_set_font_options (GtkWidget                  *widget,
  * Returns the #cairo_font_options_t used for Pango rendering. When not set,
  * the defaults font options for the #GdkScreen will be used.
  *
- * Returns: (transfer none): the #cairo_font_options_t or %NULL if not set
+ * Returns: (nullable) (transfer none): the #cairo_font_options_t or %NULL if not set
  *
  * Since: 3.18
  **/
@@ -10475,7 +10476,7 @@ gtk_widget_set_font_map (GtkWidget    *widget,
  *
  * Gets the font map that has been set with gtk_widget_set_font_map().
  *
- * Returns: (transfer none): A #PangoFontMap, or %NULL
+ * Returns: (nullable) (transfer none): A #PangoFontMap, or %NULL
  *
  * Since: 3.18
  */
@@ -11616,7 +11617,8 @@ gtk_widget_get_toplevel (GtkWidget *widget)
  * Note that unlike gtk_widget_is_ancestor(), gtk_widget_get_ancestor()
  * considers @widget to be an ancestor of itself.
  *
- * Returns: (transfer none): the ancestor widget, or %NULL if not found
+ * Returns: (nullable) (transfer none): the ancestor widget,
+ * or %NULL if not found
  **/
 GtkWidget*
 gtk_widget_get_ancestor (GtkWidget *widget,
@@ -15572,8 +15574,8 @@ gtk_widget_set_tooltip_text (GtkWidget   *widget,
  *
  * Gets the contents of the tooltip for @widget.
  *
- * Returns: the tooltip text, or %NULL. You should free the
- *   returned string with g_free() when done.
+ * Returns: (nullable) (transfer full): the tooltip text, or %NULL.
+ * You should free the returned string with g_free() when done.
  *
  * Since: 2.12
  */
@@ -15620,8 +15622,8 @@ gtk_widget_set_tooltip_markup (GtkWidget   *widget,
  *
  * Gets the contents of the tooltip for @widget.
  *
- * Returns: the tooltip text, or %NULL. You should free the
- *   returned string with g_free() when done.
+ * Returns: (nullable) (transfer full): the tooltip text, or %NULL. You should
+ * free the returned string with g_free() when done.
  *
  * Since: 2.12
  */