[gtk+/wip/aruiz/nullable-annotations] nullable annotations: gtk_menu_item_get_submenu gtk_offscreen_window_get_pixbuf gtk_offscreen_



commit 196509ea5ff8b1a9e9e67eece61fd8f2d084c3bf
Author: Alberto Ruiz <aruiz gnome org>
Date:   Sat Dec 12 19:11:21 2015 +0000

    nullable annotations:
      gtk_menu_item_get_submenu
      gtk_offscreen_window_get_pixbuf
      gtk_offscreen_window_get_surface
      gtk_paned_get_child1
      gtk_paned_get_child2
      gtk_places_sidebar_get_location
      gtk_places_sidebar_get_nth_bookmark

 gtk/gtkmenuitem.c        |    2 +-
 gtk/gtkoffscreenwindow.c |    4 ++--
 gtk/gtkpaned.c           |    4 ++--
 gtk/gtkplacessidebar.c   |    4 ++--
 gtk/gtkplug.c            |    2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 8a29658..20c3f90 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -1351,7 +1351,7 @@ gtk_menu_item_set_submenu (GtkMenuItem *menu_item,
  * Gets the submenu underneath this menu item, if any.
  * See gtk_menu_item_set_submenu().
  *
- * Returns: (transfer none): submenu for this menu item, or %NULL if none
+ * Returns: (transfer none) (nullable): submenu for this menu item, or %NULL if none
  */
 GtkWidget *
 gtk_menu_item_get_submenu (GtkMenuItem *menu_item)
diff --git a/gtk/gtkoffscreenwindow.c b/gtk/gtkoffscreenwindow.c
index ec780e5..90185ce 100644
--- a/gtk/gtkoffscreenwindow.c
+++ b/gtk/gtkoffscreenwindow.c
@@ -297,7 +297,7 @@ gtk_offscreen_window_new (void)
  * a #cairo_surface_t.  If you need to keep this around over window
  * resizes then you should add a reference to it.
  *
- * Returns: (transfer none): A #cairo_surface_t pointer to the offscreen
+ * Returns: (transfer none) (nullable): A #cairo_surface_t pointer to the offscreen
  *     surface, or %NULL.
  *
  * Since: 2.20
@@ -319,7 +319,7 @@ gtk_offscreen_window_get_surface (GtkOffscreenWindow *offscreen)
  * and the application should unreference it once it is no longer
  * needed.
  *
- * Returns: (transfer full): A #GdkPixbuf pointer, or %NULL.
+ * Returns: (transfer full) (nullable): A #GdkPixbuf pointer, or %NULL.
  *
  * Since: 2.20
  */
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index e6d230c..83201d7 100644
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -2162,7 +2162,7 @@ gtk_paned_set_position (GtkPaned *paned,
  * 
  * Obtains the first child of the paned widget.
  * 
- * Returns: (transfer none): first child, or %NULL if it is not set.
+ * Returns: (transfer none) (nullable): first child, or %NULL if it is not set.
  *
  * Since: 2.4
  **/
@@ -2180,7 +2180,7 @@ gtk_paned_get_child1 (GtkPaned *paned)
  * 
  * Obtains the second child of the paned widget.
  * 
- * Returns: (transfer none): second child, or %NULL if it is not set.
+ * Returns: (transfer none) (nullable): second child, or %NULL if it is not set.
  *
  * Since: 2.4
  **/
diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
index 96a4a2e..cf1faa0 100644
--- a/gtk/gtkplacessidebar.c
+++ b/gtk/gtkplacessidebar.c
@@ -4524,8 +4524,8 @@ gtk_places_sidebar_set_location (GtkPlacesSidebar *sidebar,
  * function to get the location that is being referred to during the callbacks
  * for your menu items.
  *
- * Returns: (transfer full): a GFile with the selected location, or #NULL if nothing is visually
- * selected.
+ * Returns: (transfer full) (nullable): a GFile with the selected location, or
+ * %NULL if nothing is visually selected.
  *
  * Since: 3.10
  */
diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index 56c37f2..d89a3d8 100644
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -384,7 +384,7 @@ gtk_plug_get_embedded (GtkPlug *plug)
  *
  * Retrieves the socket the plug is embedded in.
  *
- * Returns: (transfer none): the window of the socket, or %NULL
+ * Returns: (transfer none) (nullable): the window of the socket, or %NULL
  *
  * Since: 2.14
  **/


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]