diff options
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-contact.c | 33 | ||||
| -rw-r--r-- | libempathy/empathy-contact.h | 6 |
2 files changed, 21 insertions, 18 deletions
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c index f3e200e27..7b23df0fc 100644 --- a/libempathy/empathy-contact.c +++ b/libempathy/empathy-contact.c @@ -1282,17 +1282,16 @@ contact_load_avatar_cache (EmpathyContact *contact, } } - if (data) + if (data != NULL) { DEBUG ("Avatar loaded from %s", filename); avatar = empathy_avatar_new ((guchar *) data, len, NULL, filename); contact_set_avatar (contact, avatar); empathy_avatar_unref (avatar); } - else - { - g_free (filename); - } + + g_free (data); + g_free (filename); return data != NULL; } @@ -1319,24 +1318,23 @@ empathy_avatar_get_type (void) * @format: the mime type of the avatar image * @filename: the filename where the avatar is stored in cache * - * Create a #EmpathyAvatar from the provided data. This function takes the - * ownership of @data, @format and @filename. + * Create a #EmpathyAvatar from the provided data. * * Returns: a new #EmpathyAvatar */ EmpathyAvatar * -empathy_avatar_new (guchar *data, +empathy_avatar_new (const guchar *data, gsize len, - gchar *format, - gchar *filename) + const gchar *format, + const gchar *filename) { EmpathyAvatar *avatar; avatar = g_slice_new0 (EmpathyAvatar); - avatar->data = data; + avatar->data = g_memdup (data, len); avatar->len = len; - avatar->format = format; - avatar->filename = filename; + avatar->format = g_strdup (format); + avatar->filename = g_strdup (filename); avatar->refcount = 1; return avatar; @@ -1783,12 +1781,17 @@ contact_set_avatar_from_tp_contact (EmpathyContact *contact) EmpathyAvatar *avatar; gchar *data; gsize len; + gchar *path; g_file_load_contents (file, NULL, &data, &len, NULL, NULL); - avatar = empathy_avatar_new ((guchar *) data, len, g_strdup (mime), - g_file_get_path (file)); + path = g_file_get_path (file); + + avatar = empathy_avatar_new ((guchar *) data, len, mime, path); + contact_set_avatar (contact, avatar); empathy_avatar_unref (avatar); + g_free (path); + g_free (data); } else { diff --git a/libempathy/empathy-contact.h b/libempathy/empathy-contact.h index 16b50e500..b32971a3f 100644 --- a/libempathy/empathy-contact.h +++ b/libempathy/empathy-contact.h @@ -117,10 +117,10 @@ gboolean empathy_contact_can_do_action (EmpathyContact *self, #define EMPATHY_TYPE_AVATAR (empathy_avatar_get_type ()) GType empathy_avatar_get_type (void) G_GNUC_CONST; -EmpathyAvatar * empathy_avatar_new (guchar *data, +EmpathyAvatar * empathy_avatar_new (const guchar *data, gsize len, - gchar *format, - gchar *filename); + const gchar *format, + const gchar *filename); EmpathyAvatar * empathy_avatar_ref (EmpathyAvatar *avatar); void empathy_avatar_unref (EmpathyAvatar *avatar); |