diff options
author | Emmanuele Bassi <ebassi@gmail.com> | 2019-04-04 09:50:34 +0000 |
---|---|---|
committer | Emmanuele Bassi <ebassi@gmail.com> | 2019-04-04 09:50:34 +0000 |
commit | 6b92a6dd844a877e69f24bcab3a6934fe7d6f393 (patch) | |
tree | 5ae321b0d9ee309cf81e554dc45f72de08cfffa7 | |
parent | 783c04e84d02b5546fe44015c00f66b2edc1f4e1 (diff) | |
parent | 8209a49151e3dc89beacf6ab779460bc890dfe9e (diff) | |
download | pango-6b92a6dd844a877e69f24bcab3a6934fe7d6f393.tar.gz |
Merge branch 'wip/ricotz/gi-fixes' into 'master'
Fix a few g-i annotation errors
See merge request GNOME/pango!50
-rw-r--r-- | pango/fonts.c | 8 | ||||
-rw-r--r-- | pango/pango-utils.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pango/fonts.c b/pango/fonts.c index 63e7c7b9..b46aef02 100644 --- a/pango/fonts.c +++ b/pango/fonts.c @@ -1527,7 +1527,7 @@ parse_field (const char *what, /** * pango_parse_style: * @str: a string to parse. - * @style: (out caller-allocates): a #PangoStyle to store the result + * @style: (out): a #PangoStyle to store the result * in. * @warn: if %TRUE, issue a g_warning() on bad input. * @@ -1548,7 +1548,7 @@ pango_parse_style (const char *str, /** * pango_parse_variant: * @str: a string to parse. - * @variant: (out caller-allocates): a #PangoVariant to store the + * @variant: (out): a #PangoVariant to store the * result in. * @warn: if %TRUE, issue a g_warning() on bad input. * @@ -1569,7 +1569,7 @@ pango_parse_variant (const char *str, /** * pango_parse_weight: * @str: a string to parse. - * @weight: (out caller-allocates): a #PangoWeight to store the result + * @weight: (out): a #PangoWeight to store the result * in. * @warn: if %TRUE, issue a g_warning() on bad input. * @@ -1590,7 +1590,7 @@ pango_parse_weight (const char *str, /** * pango_parse_stretch: * @str: a string to parse. - * @stretch: (out caller-allocates): a #PangoStretch to store the + * @stretch: (out): a #PangoStretch to store the * result in. * @warn: if %TRUE, issue a g_warning() on bad input. * diff --git a/pango/pango-utils.c b/pango/pango-utils.c index 088a60d6..bb5d18ad 100644 --- a/pango/pango-utils.c +++ b/pango/pango-utils.c @@ -255,7 +255,7 @@ pango_split_file_list (const char *str) /** * pango_read_line: * @stream: a stdio stream - * @str: (out): #GString buffer into which to write the result + * @str: #GString buffer into which to write the result * * Reads an entire line from a file into a buffer. Lines may * be delimited with '\n', '\r', '\n\r', or '\r\n'. The delimiter @@ -391,7 +391,7 @@ pango_skip_space (const char **pos) /** * pango_scan_word: * @pos: (inout): in/out string position - * @out: (out): a #GString into which to write the result + * @out: a #GString into which to write the result * * Scans a word into a #GString buffer. A word consists * of [A-Za-z_] followed by zero or more [A-Za-z_0-9] @@ -435,7 +435,7 @@ pango_scan_word (const char **pos, GString *out) /** * pango_scan_string: * @pos: (inout): in/out string position - * @out: (out): a #GString into which to write the result + * @out: a #GString into which to write the result * * Scans a string into a #GString buffer. The string may either * be a sequence of non-white-space characters, or a quoted |