diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-05-20 00:43:29 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-05-20 00:43:29 +0000 |
| commit | e2d1a595b84ca31d89ae20734155e6d1de635502 (patch) | |
| tree | 51fdf2d97b85ef4a3e7c870389b92130c9b1a491 /pango/pango-markup.c | |
| parent | 3940a1714e84b076d04d4638c88df3dba7d8014e (diff) | |
| parent | 7f04ed9259fd91cdb3dc61c5aa43d196ec6a965f (diff) | |
| download | pango-e2d1a595b84ca31d89ae20734155e6d1de635502.tar.gz | |
Merge branch 'docs-cleanup' into 'master'
introspection: Stop using allow-none
See merge request GNOME/pango!333
Diffstat (limited to 'pango/pango-markup.c')
| -rw-r--r-- | pango/pango-markup.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pango/pango-markup.c b/pango/pango-markup.c index eca3e630..3728d3b3 100644 --- a/pango/pango-markup.c +++ b/pango/pango-markup.c @@ -602,9 +602,9 @@ pango_markup_parser_new_internal (char accel_marker, * @markup_text: markup to parse (see the Pango Markup docs) * @length: length of @markup_text, or -1 if nul-terminated * @accel_marker: character that precedes an accelerator, or 0 for none - * @attr_list: (out) (allow-none): address of return location for a `PangoAttrList`, or %NULL - * @text: (out) (allow-none): address of return location for text with tags stripped, or %NULL - * @accel_char: (out) (allow-none): address of return location for accelerator char, or %NULL + * @attr_list: (out) (optional): address of return location for a `PangoAttrList`, or %NULL + * @text: (out) (optional): address of return location for text with tags stripped, or %NULL + * @accel_char: (out) (optional): address of return location for accelerator char, or %NULL * @error: address of return location for errors, or %NULL * * Parses marked-up text to create a plain-text string and an attribute list. @@ -726,9 +726,9 @@ pango_markup_parser_new (gunichar accel_marker) /** * pango_markup_parser_finish: * @context: A valid parse context that was returned from [func@markup_parser_new] - * @attr_list: (out) (allow-none): address of return location for a `PangoAttrList`, or %NULL - * @text: (out) (allow-none): address of return location for text with tags stripped, or %NULL - * @accel_char: (out) (allow-none): address of return location for accelerator char, or %NULL + * @attr_list: (out) (optional): address of return location for a `PangoAttrList`, or %NULL + * @text: (out) (optional): address of return location for text with tags stripped, or %NULL + * @accel_char: (out) (optional): address of return location for accelerator char, or %NULL * @error: address of return location for errors, or %NULL * * Finishes parsing markup. |