diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-13 13:54:16 +0000 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-13 13:54:16 +0000 |
commit | 087e1043269d361b1f349b1cf123ac10506e4bbc (patch) | |
tree | f6ecfb1f88559a6b5264f226db962b97cbad591c | |
parent | e8c68230750766d6dc1d5594cc898f2d914c91fb (diff) | |
parent | 3d96ce6954390613bf19bf8e5cf28ab1957717f2 (diff) | |
download | telepathy-glib-087e1043269d361b1f349b1cf123ac10506e4bbc.tar.gz |
Merge branch 'telepathy-glib-0.22'
Conflicts:
NEWS
-rw-r--r-- | NEWS | 10 | ||||
-rw-r--r-- | telepathy-glib/contact.c | 10 | ||||
-rw-r--r-- | telepathy-glib/proxy.c | 2 |
3 files changed, 17 insertions, 5 deletions
@@ -1,3 +1,13 @@ +telepathy-glib 0.23.3 (UNRELEASED) +================================== + +Fixes: + +• fix a memory leak when cleaning up TpProxy "prepare" requests + (fd.o #76000, Simon) + +• fix a memory leak for paths to contacts' avatar data (fd.o #76000, Simon) + telepathy-glib 0.23.2 (2014-02-26) ================================== diff --git a/telepathy-glib/contact.c b/telepathy-glib/contact.c index 4b547b62b..1f881c2a6 100644 --- a/telepathy-glib/contact.c +++ b/telepathy-glib/contact.c @@ -2855,21 +2855,23 @@ mime_file_written (GObject *source_object, WriteAvatarData *avatar_data = user_data; GFile *file = G_FILE (source_object); TpContact *self; + gchar *path = g_file_get_path (file); g_assert (file == avatar_data->mime_file); if (!g_file_replace_contents_finish (file, res, NULL, &error)) { - DEBUG ("Failed to store MIME type in cache (%s): %s", - g_file_get_path (file), error->message); + DEBUG ("Failed to store MIME type in cache (%s): %s", path, + error->message); g_clear_error (&error); } else { - DEBUG ("Contact avatar MIME type stored in cache: %s", - g_file_get_path (file)); + DEBUG ("Contact avatar MIME type stored in cache: %s", path); } + g_free (path); + self = g_weak_ref_get (&avatar_data->contact); if (self == NULL) diff --git a/telepathy-glib/proxy.c b/telepathy-glib/proxy.c index 8d6befbf4..f7a5a0efc 100644 --- a/telepathy-glib/proxy.c +++ b/telepathy-glib/proxy.c @@ -2208,7 +2208,7 @@ finish_all_requests (TpProxy *self, tp_proxy_prepare_request_finish (iter->data, error); } - g_queue_clear (tmp); + g_queue_free (tmp); } /* |