summaryrefslogtreecommitdiff
path: root/pango/pangocairo-context.c
diff options
context:
space:
mode:
authorEvan Nemerson <evan@nemerson.com>2014-05-30 19:21:11 -0700
committerEvan Nemerson <evan@nemerson.com>2014-10-16 13:09:34 -0700
commitfa6ded9b0d065634481d8ae4126fdea0b88e3558 (patch)
tree151efb6762bf467ada2ac104770fdefd293b7248 /pango/pangocairo-context.c
parentadb5a4e86b09b0935ec1dd71bf05ac41807c84a2 (diff)
downloadpango-fa6ded9b0d065634481d8ae4126fdea0b88e3558.tar.gz
Add many missing nullability annotations.
https://bugzilla.gnome.org/show_bug.cgi?id=731022
Diffstat (limited to 'pango/pangocairo-context.c')
-rw-r--r--pango/pangocairo-context.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/pango/pangocairo-context.c b/pango/pangocairo-context.c
index 9750fb03..9dd02351 100644
--- a/pango/pangocairo-context.c
+++ b/pango/pangocairo-context.c
@@ -218,8 +218,8 @@ pango_cairo_context_get_resolution (PangoContext *context)
/**
* pango_cairo_context_set_font_options:
* @context: a #PangoContext, from a pangocairo font map
- * @options: a #cairo_font_options_t, or %NULL to unset any previously set
- * options. A copy is made.
+ * @options: (nullable): a #cairo_font_options_t, or %NULL to unset
+ * any previously set options. A copy is made.
*
* Sets the font options used when rendering text with this context.
* These options override any options that pango_cairo_update_context()
@@ -263,9 +263,9 @@ pango_cairo_context_set_font_options (PangoContext *context,
* pango_cairo_context_set_font_options(). This function does not report options
* that are derived from the target surface by pango_cairo_update_context()
*
- * Return value: the font options previously set on the context, or %NULL
- * if no options have been set. This value is owned by the context
- * and must not be modified or freed.
+ * Return value: (nullable): the font options previously set on the
+ * context, or %NULL if no options have been set. This value is
+ * owned by the context and must not be modified or freed.
*
* Since: 1.10
**/
@@ -316,8 +316,8 @@ _pango_cairo_context_get_merged_font_options (PangoContext *context)
/**
* pango_cairo_context_set_shape_renderer:
* @context: a #PangoContext, from a pangocairo font map
- * @func: Callback function for rendering attributes of type
- * %PANGO_ATTR_SHAPE, or %NULL to disable shape rendering.
+ * @func: (nullable): Callback function for rendering attributes of
+ * type %PANGO_ATTR_SHAPE, or %NULL to disable shape rendering.
* @data: User data that will be passed to @func.
* @dnotify: Callback that will be called when the
* context is freed to release @data, or %NULL.
@@ -361,8 +361,9 @@ pango_cairo_context_set_shape_renderer (PangoContext *context,
* attributes of type %PANGO_ATTR_SHAPE as set by
* pango_cairo_context_set_shape_renderer(), if any.
*
- * Return value: the shape rendering callback previously set on the context, or %NULL
- * if no shape rendering callback have been set.
+ * Return value: (nullable): the shape rendering callback previously
+ * set on the context, or %NULL if no shape rendering callback have
+ * been set.
*
* Since: 1.18
*/