Move avatar cache to ~/.cache and don't mix avatar from different contacts, tokens...

[empathy.git] / megaphone / src / megaphone-applet.c

diff --git a/megaphone/src/megaphone-applet.c b/megaphone/src/megaphone-applet.c
index 5deeb6c9809e799d0903f8d713a7a7c6764b8e84..449bad3202346e2c994e49c991717fcc76188ca4 100644 (file)
--- a/megaphone/src/megaphone-applet.c
+++ b/megaphone/src/megaphone-applet.c
@@ -177,18 +177,16 @@ megaphone_applet_update_icon (MegaphoneApplet *applet)
                                                              "avatar_token",
                                                              NULL);
                if (!G_STR_EMPTY (avatar_token)) {
-                       avatar = empathy_avatar_new_from_cache (avatar_token);
+                       empathy_contact_load_avatar_cache (priv->contact, avatar_token);
+                       avatar = empathy_contact_get_avatar (priv->contact);
                }
                g_free (avatar_token);
-       } else {
-               empathy_avatar_ref (avatar);
        }
 
        if (avatar) {
                avatar_pixbuf = empathy_pixbuf_from_avatar_scaled (avatar,
                                                                   priv->image_size - 2,
                                                                   priv->image_size - 2);
-               empathy_avatar_unref (avatar);
        } else {
                GtkIconTheme *icon_theme;