diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-13 13:57:09 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-13 13:57:09 +0000 |
| commit | f9b4a13b80961c59f81aca14f5d3b988d68a7146 (patch) | |
| tree | bc849f9929f416eaabc5844061f239dab53fb1e0 | |
| parent | d4f45ac6e79e7bd6dbca5d03d8a0dd349202ad72 (diff) | |
| parent | 087e1043269d361b1f349b1cf123ac10506e4bbc (diff) | |
| download | telepathy-glib-f9b4a13b80961c59f81aca14f5d3b988d68a7146.tar.gz | |
Merge branch 'master' into next
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.99.8 (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.99.7 (2014-01-29) ================================== diff --git a/telepathy-glib/contact.c b/telepathy-glib/contact.c index 95665e758..f59bd75fa 100644 --- a/telepathy-glib/contact.c +++ b/telepathy-glib/contact.c @@ -2054,21 +2054,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 bf9ed4076..8db1cf461 100644 --- a/telepathy-glib/proxy.c +++ b/telepathy-glib/proxy.c @@ -2128,7 +2128,7 @@ finish_all_requests (TpProxy *self, tp_proxy_prepare_request_finish (iter->data, error); } - g_queue_clear (tmp); + g_queue_free (tmp); } /* |