diff options
author | Matthias Clasen <mclasen@redhat.com> | 2020-11-17 13:41:54 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2020-11-17 13:41:54 +0000 |
commit | 436e6b4e981a40525537caab13315ec85f3ec882 (patch) | |
tree | f198e021de0433333cba2381aa9dccdf3cf004db /gtkdoc | |
parent | d154ebc31a69c089192d1aeefa84f40d7231eee1 (diff) | |
parent | 5288e7a0ebe9ffd2f6b621a1c2c762914168365b (diff) | |
download | gtk-doc-436e6b4e981a40525537caab13315ec85f3ec882.tar.gz |
Merge branch 'master' into 'master'
mkdb: Make transfer annotation tooltips less ambiguous
See merge request GNOME/gtk-doc!44
Diffstat (limited to 'gtkdoc')
-rw-r--r-- | gtkdoc/mkdb.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtkdoc/mkdb.py b/gtkdoc/mkdb.py index 9a68da4..98fd5eb 100644 --- a/gtkdoc/mkdb.py +++ b/gtkdoc/mkdb.py @@ -155,10 +155,10 @@ AnnotationDefinition = { 'scope notified': "The callback is valid until the GDestroyNotify argument is called.", 'set-value-func': "The specified function is used to convert from a struct to a GValue, must be a GTypeInstance.", 'skip': "Exposed in C code, not necessarily available in other languages.", - 'transfer container': "Free data container after the code is done.", + 'transfer container': "The caller owns the data container, but not the data inside it.", 'transfer floating': "Alias for <acronym>transfer none</acronym>, used for objects with floating refs.", - 'transfer full': "Free data after the code is done.", - 'transfer none': "Don't free data after the code is done.", + 'transfer full': "The caller owns the data, and is responsible for free it.", + 'transfer none': "The data is owned by the callee, which is responsible of freeing it.", 'type': "Override the parsed C type with given type.", 'unref-func': "The specified function is used to unref a struct, must be a GTypeInstance.", 'virtual': "This is the invoker for a virtual method.", |