summaryrefslogtreecommitdiff
path: root/telepathy-glib
diff options
context:
space:
mode:
Diffstat (limited to 'telepathy-glib')
-rw-r--r--telepathy-glib/contact.c10
-rw-r--r--telepathy-glib/proxy.c2
2 files changed, 7 insertions, 5 deletions
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);
}
/*