[gtk+/wip/aruiz/nullable-annotations] nullable annotations: gtk_assistante_get_nth_page gtk_builder_get_application gtk_builder_get_
- From: Alberto Ruiz <aruiz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/aruiz/nullable-annotations] nullable annotations: gtk_assistante_get_nth_page gtk_builder_get_application gtk_builder_get_
- Date: Wed, 19 Aug 2015 00:34:35 +0000 (UTC)
commit a855c6dda39e1108e9e1c8b981e80779b956e354
Author: Alberto Ruiz <aruiz gnome org>
Date: Wed Aug 19 01:33:04 2015 +0100
nullable annotations:
gtk_assistante_get_nth_page
gtk_builder_get_application
gtk_builder_get_object
gtk_builder_lookup_callback_symbol
gtk_button_get_image
GtkCallendarDetailFunc
gtk/gtkassistant.c | 2 +-
gtk/gtkbuilder.c | 6 +++---
gtk/gtkbutton.c | 3 ++-
gtk/gtkcalendar.h | 4 ++--
4 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index b6d2d82..2d9ca4d 100644
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -1675,7 +1675,7 @@ gtk_assistant_get_n_pages (GtkAssistant *assistant)
*
* Returns the child widget contained in page number @page_num.
*
- * Returns: (transfer none): the child widget, or %NULL
+ * Returns: (nullable) (transfer none): the child widget, or %NULL
* if @page_num is out of bounds
*
* Since: 2.10
diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index 02c2cda..dcee943 100644
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -1425,7 +1425,7 @@ gtk_builder_add_objects_from_string (GtkBuilder *builder,
* Gets the object named @name. Note that this function does not
* increment the reference count of the returned object.
*
- * Returns: (transfer none): the object named @name or %NULL if
+ * Returns: (nullable) (transfer none): the object named @name or %NULL if
* it could not be found in the object tree.
*
* Since: 2.12
@@ -2435,7 +2435,7 @@ gtk_builder_add_callback_symbols (GtkBuilder *builder,
* or for any case that one might be cusomizing signal connections
* using gtk_builder_connect_signals_full()
*
- * Returns: The callback symbol in @builder for @callback_name, or %NULL
+ * Returns (nullable): The callback symbol in @builder for @callback_name, or %NULL
*
* Since: 3.10
*/
@@ -2578,7 +2578,7 @@ gtk_builder_set_application (GtkBuilder *builder,
* g_application_get_default(). If you want to use another application
* for constructing proxies, use gtk_builder_set_application().
*
- * Returns: (transfer none): the application being used by the builder,
+ * Returns: (nullable) (transfer none): the application being used by the builder,
* or %NULL
*
* Since: 3.10
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 8abbceb..d46fe5e 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -2664,7 +2664,8 @@ gtk_button_set_image (GtkButton *button,
* This may have been explicitly set by gtk_button_set_image()
* or constructed by gtk_button_new_from_stock().
*
- * Returns: (transfer none): a #GtkWidget or %NULL in case there is no image
+ * Returns: (nullable) (transfer none): a #GtkWidget or %NULL in case
+ * there is no image
*
* Since: 2.6
*/
diff --git a/gtk/gtkcalendar.h b/gtk/gtkcalendar.h
index ad4efcd..28a0514 100644
--- a/gtk/gtkcalendar.h
+++ b/gtk/gtkcalendar.h
@@ -86,8 +86,8 @@ typedef enum
*
* Since: 2.14
*
- * Returns: Newly allocated string with Pango markup with details
- * for the specified day, or %NULL.
+ * Returns (nullable) (transfer full): Newly allocated string with Pango markup
+ * with details for the specified day or %NULL.
*/
typedef gchar* (*GtkCalendarDetailFunc) (GtkCalendar *calendar,
guint year,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]