diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2022-11-18 17:53:10 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2022-11-18 17:53:10 +0000 |
| commit | 24dff0be51c2c77323878c7a13536d6f85e31b98 (patch) | |
| tree | 3c18e7c6513fa6a5cf64fc443d42336a3c8f4d10 | |
| parent | 29a72d39debea8f84eada42914aaa7d78b9d9fdc (diff) | |
| parent | 80d4b11e13cfbbb02025e542721dffcc29050717 (diff) | |
| download | pango-24dff0be51c2c77323878c7a13536d6f85e31b98.tar.gz | |
Merge branch 'array-annotations' into 'main'
Fix some g-i annotations related to arrays
See merge request GNOME/pango!655
| -rw-r--r-- | pango/pango-language.c | 5 | ||||
| -rw-r--r-- | pango/pangofc-font.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pango/pango-language.c b/pango/pango-language.c index b963ef13..410e6f98 100644 --- a/pango/pango-language.c +++ b/pango/pango-language.c @@ -617,8 +617,7 @@ pango_language_get_sample_string (PangoLanguage *language) /** * pango_language_get_scripts: * @language: (nullable): a `PangoLanguage` - * @num_scripts: (out caller-allocates) (optional): location to - * return number of scripts + * @num_scripts: (out) (optional): location to return number of scripts * * Determines the scripts used to to write @language. * @@ -853,7 +852,7 @@ out: * you should first try the default language, followed by the * languages returned by this function. * - * Returns: (transfer none) (nullable): a %NULL-terminated array + * Returns: (transfer none) (nullable) (array zero-terminated=1): a %NULL-terminated array * of `PangoLanguage`* * * Since: 1.48 diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c index 053e93cd..d0077b34 100644 --- a/pango/pangofc-font.c +++ b/pango/pangofc-font.c @@ -1091,8 +1091,8 @@ done: * The returned array is only valid as long as the font * and its fontmap are valid. * - * Returns: (transfer none) (nullable): a %NULL-terminated - * array of `PangoLanguage`* + * Returns: (transfer none) (nullable) (array zero-terminated=1): a + * %NULL-terminated array of `PangoLanguage`* * * Since: 1.48 * Deprecated: 1.50: Use pango_font_get_language() |