summaryrefslogtreecommitdiff
path: root/gtk/deprecated
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2016-09-22 13:56:47 +0200
committerRico Tzschichholz <ricotz@ubuntu.com>2016-09-22 14:02:07 +0200
commita3f1596069ae966ffa785e85327a868e041560c4 (patch)
tree54e57c55f3d8e73ceb7d1c6db7fe54c550fc0726 /gtk/deprecated
parent54fdcb3ffac3383432b379f3e16e8cb0086b8101 (diff)
downloadgtk+-a3f1596069ae966ffa785e85327a868e041560c4.tar.gz
Add some missing (nullable) annotations
https://bugzilla.gnome.org/show_bug.cgi?id=771826
Diffstat (limited to 'gtk/deprecated')
-rw-r--r--gtk/deprecated/gtknumerableicon.c8
-rw-r--r--gtk/deprecated/gtkstatusicon.c12
-rw-r--r--gtk/deprecated/gtkstyle.c2
-rw-r--r--gtk/deprecated/gtkthemingengine.c4
4 files changed, 13 insertions, 13 deletions
diff --git a/gtk/deprecated/gtknumerableicon.c b/gtk/deprecated/gtknumerableicon.c
index 7f63f4da31..7527c5e977 100644
--- a/gtk/deprecated/gtknumerableicon.c
+++ b/gtk/deprecated/gtknumerableicon.c
@@ -713,7 +713,7 @@ _gtk_numerable_icon_set_background_icon_size (GtkNumerableIcon *self,
*
* Returns the currently displayed label of the icon, or %NULL.
*
- * Returns: the currently displayed label
+ * Returns: (nullable): the currently displayed label
*
* Since: 3.0
*
@@ -825,7 +825,7 @@ gtk_numerable_icon_set_count (GtkNumerableIcon *self,
* Returns the #GtkStyleContext used by the icon for theming,
* or %NULL if there’s none.
*
- * Returns: (transfer none): a #GtkStyleContext, or %NULL.
+ * Returns: (nullable) (transfer none): a #GtkStyleContext, or %NULL.
* This object is internal to GTK+ and should not be unreffed.
* Use g_object_ref() if you want to keep it around
*
@@ -919,7 +919,7 @@ gtk_numerable_icon_set_background_gicon (GtkNumerableIcon *self,
* %NULL if there’s none. The caller of this function does not own
* a reference to the returned #GIcon.
*
- * Returns: (transfer none): a #GIcon, or %NULL
+ * Returns: (nullable) (transfer none): a #GIcon, or %NULL
*
* Since: 3.0
*
@@ -992,7 +992,7 @@ gtk_numerable_icon_set_background_icon_name (GtkNumerableIcon *self,
* Returns the icon name used as the base background image,
* or %NULL if there’s none.
*
- * Returns: an icon name, or %NULL
+ * Returns: (nullable): an icon name, or %NULL
*
* Since: 3.0
*
diff --git a/gtk/deprecated/gtkstatusicon.c b/gtk/deprecated/gtkstatusicon.c
index 7df11cdec1..b33a296751 100644
--- a/gtk/deprecated/gtkstatusicon.c
+++ b/gtk/deprecated/gtkstatusicon.c
@@ -1919,7 +1919,7 @@ gtk_status_icon_get_storage_type (GtkStatusIcon *status_icon)
* The caller of this function does not own a reference to the
* returned pixbuf.
*
- * Returns: (transfer none): the displayed pixbuf,
+ * Returns: (nullable) (transfer none): the displayed pixbuf,
* or %NULL if the image is empty.
*
* Since: 2.10
@@ -1948,7 +1948,7 @@ gtk_status_icon_get_pixbuf (GtkStatusIcon *status_icon)
* The returned string is owned by the #GtkStatusIcon and should not
* be freed or modified.
*
- * Returns: stock id of the displayed stock icon,
+ * Returns: (nullable): stock id of the displayed stock icon,
* or %NULL if the image is empty.
*
* Since: 2.10
@@ -1977,7 +1977,7 @@ gtk_status_icon_get_stock (GtkStatusIcon *status_icon)
* The returned string is owned by the #GtkStatusIcon and should not
* be freed or modified.
*
- * Returns: name of the displayed icon, or %NULL if the image is empty.
+ * Returns: (nullable): name of the displayed icon, or %NULL if the image is empty.
*
* Since: 2.10
*
@@ -2007,7 +2007,7 @@ gtk_status_icon_get_icon_name (GtkStatusIcon *status_icon)
*
* If this function fails, @icon is left unchanged;
*
- * Returns: (transfer none): the displayed icon, or %NULL if the image is empty
+ * Returns: (nullable) (transfer none): the displayed icon, or %NULL if the image is empty
*
* Since: 2.14
*
@@ -2582,7 +2582,7 @@ gtk_status_icon_set_tooltip_text (GtkStatusIcon *status_icon,
*
* Gets the contents of the tooltip for @status_icon.
*
- * Returns: the tooltip text, or %NULL. You should free the
+ * Returns: (nullable): the tooltip text, or %NULL. You should free the
* returned string with g_free() when done.
*
* Since: 2.16
@@ -2672,7 +2672,7 @@ gtk_status_icon_set_tooltip_markup (GtkStatusIcon *status_icon,
*
* Gets the contents of the tooltip for @status_icon.
*
- * Returns: the tooltip text, or %NULL. You should free the
+ * Returns: (nullable): the tooltip text, or %NULL. You should free the
* returned string with g_free() when done.
*
* Since: 2.16
diff --git a/gtk/deprecated/gtkstyle.c b/gtk/deprecated/gtkstyle.c
index 291e5c2306..9477578fef 100644
--- a/gtk/deprecated/gtkstyle.c
+++ b/gtk/deprecated/gtkstyle.c
@@ -4752,7 +4752,7 @@ gtk_widget_class_path (GtkWidget *widget,
* the application and should not be modified. The pixbuf should be
* freed after use with g_object_unref().
*
- * Returns: (transfer full): a new pixbuf, or %NULL if the
+ * Returns: (nullable) (transfer full): a new pixbuf, or %NULL if the
* stock ID wasn’t known
*
* Deprecated: 3.0: Use gtk_widget_render_icon_pixbuf() instead.
diff --git a/gtk/deprecated/gtkthemingengine.c b/gtk/deprecated/gtkthemingengine.c
index e26e8078e6..24dbc79ad3 100644
--- a/gtk/deprecated/gtkthemingengine.c
+++ b/gtk/deprecated/gtkthemingengine.c
@@ -951,7 +951,7 @@ gtk_theming_module_init (GtkThemingModule *module)
* Loads and initializes a theming engine module from the
* standard directories.
*
- * Returns: (transfer none): A theming engine, or %NULL if
+ * Returns: (nullable) (transfer none): A theming engine, or %NULL if
* the engine @name doesn’t exist.
*
* Deprecated: 3.14
@@ -1004,7 +1004,7 @@ gtk_theming_engine_load (const gchar *name)
*
* Returns the #GdkScreen to which @engine currently rendering to.
*
- * Returns: (transfer none): a #GdkScreen, or %NULL.
+ * Returns: (nullable) (transfer none): a #GdkScreen, or %NULL.
*
* Deprecated: 3.14
**/