diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-08-04 13:59:12 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-08-04 13:59:12 +0000 |
| commit | daa9d0ab21a9c6e9cbadc8e6776a3b3461246763 (patch) | |
| tree | 7ce2f87e41dce541ec127d3a531a094d6be0f327 | |
| parent | 6a01f34760cce89356be4683c400844748ff8c10 (diff) | |
| parent | 8746587205a85afe9cec580262b6f99bc73703f8 (diff) | |
| download | pango-daa9d0ab21a9c6e9cbadc8e6776a3b3461246763.tar.gz | |
Merge branch 'ricotz/parse-color-with-alpha' into 'master'
Fix g-i annotation of pango_parse_color_with_alpha and add since tag
See merge request GNOME/pango!216
| -rw-r--r-- | pango/pango-color.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pango/pango-color.c b/pango/pango-color.c index 9c044810..a530719f 100644 --- a/pango/pango-color.c +++ b/pango/pango-color.c @@ -211,7 +211,7 @@ hex (const char *spec, * pango_color_parse_with_alpha: * @color: (nullable): a #PangoColor structure in which to store the * result, or %NULL - * @alpha: (nullable): return location for alpha, or %NULL + * @alpha: (out) (optional): return location for alpha, or %NULL * @spec: a string specifying the new color * * Fill in the fields of a color from a string specification. The @@ -231,6 +231,8 @@ hex (const char *spec, * * Return value: %TRUE if parsing of the specifier succeeded, * otherwise false. + * + * Since: 1.46 */ gboolean pango_color_parse_with_alpha (PangoColor *color, |