diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-06-10 14:52:10 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-06-10 14:52:10 +0100 |
| commit | 2acff880f5bcbd6a69baaad960ea3a029e34736e (patch) | |
| tree | fd930eedb13f3c712813a907a1726513592a4835 | |
| parent | 60b2bbdce8ebe22152ac2078bb095a3eb0bef668 (diff) | |
| parent | 65cfeebe29bdd85fa7b72856ce93b900f7af1539 (diff) | |
Merge branch 'telepathy-glib-0.20'
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | telepathy-glib/debug-client.c | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -3,6 +3,9 @@ telepathy-glib 0.21.1 (UNRELEASED) Fixes: +• Fix a wrong introspection annotation on tp_debug_client_get_messages_finish() + that would lead to use-after-free (fd.o #65518, Simon) + • Isolate regression tests better (fd.o #63119, Simon) • Explicitly annotate tp_account_update_parameters_finish()'s diff --git a/telepathy-glib/debug-client.c b/telepathy-glib/debug-client.c index 113ac3ff3..89712db40 100644 --- a/telepathy-glib/debug-client.c +++ b/telepathy-glib/debug-client.c @@ -536,8 +536,8 @@ tp_debug_client_get_messages_async ( * * Finishes tp_debug_client_set_enabled_async(). * - * Returns: (transfer full) (type GLib.PtrArray) (element-type TelepathyGLib.DebugMessage): - * a #GPtrArray of #TpDebugMessage + * Returns: (transfer container) (type GLib.PtrArray) (element-type TelepathyGLib.DebugMessage): + * a #GPtrArray of #TpDebugMessage, free with g_ptr_array_unref() * * Since: 0.19.0 */ |