[gtk+/wip/aruiz/nullable-annotations] nullable annotations: gtk_font_chooser_get_font_map gtk_binding_set_find gtk_icon_view_get_pat

[Alberto Ruiz <aruiz src gnome org>]

commit bb326d30d4c4ffa607f73a0dbdc8f67a8fc93396
Author: Alberto Ruiz <aruiz gnome org>
Date:   Sun Dec 13 04:12:59 2015 +0000

    nullable annotations:
      gtk_font_chooser_get_font_map
      gtk_binding_set_find
      gtk_icon_view_get_path_at_pos
      gtk_menu_button_get_popup
      gtk_popover_get_default_widget

 gtk/gtkfontchooser.c |    2 +-
 gtk/gtkicontheme.c   |    2 +-
 gtk/gtkiconview.c    |    6 +++---
 gtk/gtkmenubutton.c  |    2 +-
 gtk/gtkpopover.c     |    3 ++-
 5 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/gtk/gtkfontchooser.c b/gtk/gtkfontchooser.c
index b5fea10..46f6fb3 100644
--- a/gtk/gtkfontchooser.c
+++ b/gtk/gtkfontchooser.c
@@ -465,7 +465,7 @@ gtk_font_chooser_set_font_map (GtkFontChooser *fontchooser,
  * Gets the custom font map of this font chooser widget,
  * or %NULL if it does not have one.
  *
- * Returns: (transfer full) (allow-none): a #PangoFontMap, or %NULL
+ * Returns: (transfer full) (nullable): a #PangoFontMap, or %NULL
  *
  * Since: 3.18
  */
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 001dc22..2201e63 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -3613,7 +3613,7 @@ gtk_icon_info_get_base_scale (GtkIconInfo *icon_info)
  * filename if a builtin icon is returned; in this case, you should
  * use gtk_icon_info_get_builtin_pixbuf().
  * 
- * Returns: (type filename): the filename for the icon, or %NULL
+ * Returns: (nullable) (type filename): the filename for the icon, or %NULL
  *     if gtk_icon_info_get_builtin_pixbuf() should be used instead.
  *     The return value is owned by GTK+ and should not be modified
  *     or freed.
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index f81b909..d2abeb6 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -4398,8 +4398,8 @@ gtk_icon_view_convert_widget_to_bin_window_coords (GtkIconView *icon_view,
  * See gtk_icon_view_convert_widget_to_bin_window_coords() for converting
  * widget coordinates to bin_window coordinates.
  * 
- * Returns: The #GtkTreePath corresponding to the icon or %NULL
- * if no icon exists at that position.
+ * Returns: (nullable) (transfer full): The #GtkTreePath corresponding
+ * to the icon or %NULL if no icon exists at that position.
  *
  * Since: 2.6 
  **/
@@ -5039,7 +5039,7 @@ gtk_icon_view_set_model (GtkIconView *icon_view,
  * Returns the model the #GtkIconView is based on.  Returns %NULL if the
  * model is unset.
  *
- * Returns: (transfer none): A #GtkTreeModel, or %NULL if none is
+ * Returns: (nullable) (transfer none): A #GtkTreeModel, or %NULL if none is
  *     currently being used.
  *
  * Since: 2.6 
diff --git a/gtk/gtkmenubutton.c b/gtk/gtkmenubutton.c
index e0d0c0e..60677f2 100644
--- a/gtk/gtkmenubutton.c
+++ b/gtk/gtkmenubutton.c
@@ -815,7 +815,7 @@ gtk_menu_button_set_popup (GtkMenuButton *menu_button,
  * If the button does not use a #GtkMenu, this function
  * returns %NULL.
  *
- * Returns: (transfer none): a #GtkMenu or %NULL
+ * Returns: (nullable) (transfer none): a #GtkMenu or %NULL
  *
  * Since: 3.6
  */
diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
index e7f3e69..6e39004 100644
--- a/gtk/gtkpopover.c
+++ b/gtk/gtkpopover.c
@@ -2434,7 +2434,8 @@ gtk_popover_set_default_widget (GtkPopover *popover,
  * Gets the widget that should be set as the default while
  * the popover is shown.
  *
- * Returns: (transfer none): the default widget, or %NULL if there is none
+ * Returns: (nullable) (transfer none): the default widget,
+ * or %NULL if there is none
  *
  * Since: 3.18
  */